Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

Commit 124bd36

Browse files
authored
rename project source files from jellyfish to fishjam (#18)
1 parent e7d7102 commit 124bd36

File tree

81 files changed

+947
-1036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+947
-1036
lines changed

.github/workflows/build_lint_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
run: ./gradlew assembleRelease
2525

2626
- name: Test
27-
run: ./gradlew :JellyfishClient:testDebugUnitTest
27+
run: ./gradlew :FishjamClient:testDebugUnitTest

.github/workflows/publish_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
env:
2525
REPO: self
2626
BRANCH: gh-pages
27-
FOLDER: JellyfishClient/build/dokka/html
27+
FOLDER: FishjamClient/build/dokka/html
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "protos"]
22
path = protos
3-
url = [email protected]:jellyfish-dev/protos.git
3+
url = [email protected]:fishjam-dev/protos.git
File renamed without changes.

JellyfishClient/build.gradle renamed to FishjamClient/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ plugins {
22
id 'com.android.library'
33
id 'org.jetbrains.kotlin.android'
44
id "org.jetbrains.dokka"
5-
id "com.google.protobuf" version "0.9.3"
5+
id "com.google.protobuf" version "0.9.4"
66
id 'maven-publish'
77

88
id "kotlin-android"
99
}
1010

1111
android {
12-
namespace 'com.jellyfishdev.jellyfishclient'
12+
namespace 'com.fishjamdev.client'
1313
compileSdk 33
1414

1515
defaultConfig {
@@ -45,8 +45,8 @@ afterEvaluate {
4545
// Creates a Maven publication called "release".
4646
release(MavenPublication) {
4747
from components.release
48-
groupId = 'com.jellyfishdev.jellyfishclient'
49-
artifactId = 'jellyfish-android-client'
48+
groupId = 'com.fishjamdev.client'
49+
artifactId = 'fishjam-android-client'
5050
version = '0.1.0'
5151
}
5252
}
@@ -61,7 +61,7 @@ afterEvaluate {
6161
}
6262

6363
tasks.named("dokkaHtml") {
64-
moduleName.set("JellyfishClient")
64+
moduleName.set("FishjamClient")
6565
dokkaSourceSets {
6666
named("main") {
6767
includes.from("module.md")
@@ -84,7 +84,7 @@ dependencies {
8484
implementation 'com.google.android.material:material:1.9.0'
8585
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
8686
implementation 'com.jakewharton.timber:timber:5.0.1'
87-
implementation 'com.google.protobuf:protobuf-kotlin:3.23.1'
87+
implementation 'com.google.protobuf:protobuf-kotlin:4.26.1'
8888

8989
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
9090

@@ -103,4 +103,4 @@ dependencies {
103103
testImplementation "io.mockk:mockk:1.13.2"
104104
testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
105105

106-
}
106+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jellyfishdev.jellyfishclient
1+
package com.fishjamdev.client
22

33
import android.content.Context
44
import android.content.Intent
@@ -12,15 +12,15 @@ import org.membraneframework.rtc.models.RTCStats
1212
import org.membraneframework.rtc.utils.Metadata
1313
import org.webrtc.Logging
1414

15-
typealias TrackContext = JellyfishTrackContext
15+
typealias TrackContext = FishjamTrackContext
1616

1717
data class Config(
1818
val websocketUrl: String,
1919
val token: String
2020
)
2121

22-
class JellyfishClient(appContext: Context, listener: JellyfishClientListener) {
23-
private val client = JellyfishClientInternal(appContext, listener)
22+
class FishjamClient(appContext: Context, listener: FishjamClientListener) {
23+
private val client = FishjamClientInternal(appContext, listener)
2424

2525
/**
2626
* Connects to the server using the WebSocket connection
@@ -41,8 +41,8 @@ class JellyfishClient(appContext: Context, listener: JellyfishClientListener) {
4141
}
4242

4343
/**
44-
* Tries to join the room. If user is accepted then {@link JellyfishClient.onConnected} will be called.
45-
* In other case {@link JellyfishClient.onConnectError} is invoked.
44+
* Tries to join the room. If user is accepted then {@link FishjamClient.onConnected} will be called.
45+
* In other case {@link FishjamClient.onConnectError} is invoked.
4646
*
4747
* @param peerMetadata - Any information that other peers will receive in onPeerJoined
4848
* after accepting this peer

0 commit comments

Comments
 (0)