Merge branch 'develop'

GetStream · Jan 18, 2024 · 39106b8 · 39106b8
2 parents c72d96b + 33ba422
commit 39106b8
Show file tree

Hide file tree

Showing 79 changed files with 2,808 additions and 787 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Check out code
         uses: actions/[email protected]
       - name: Set up JDK
-        uses: actions/setup-java@v3.5.1
+        uses: actions/setup-java@v3.6.0
         with:
           distribution: adopt
           java-version: 17
@@ -54,7 +54,7 @@ jobs:
       - name: Check out code
         uses: actions/[email protected]
       - name: Set up JDK
-        uses: actions/setup-java@v3.5.1
+        uses: actions/setup-java@v3.6.0
         with:
           distribution: adopt
           java-version: 17
@@ -67,18 +67,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3.6.0
         with:
+          distribution: adopt
           java-version: 17
 
-      - name: Prepare environment
-        run: |
-          echo "${{ secrets.RELEASE_KEYSTORE }}" > .sign/release.keystore.asc
-          gpg -d --passphrase "${{ secrets.PASSPHRASE }}" --batch .sign/release.keystore.asc > .sign/release.keystore
-          echo "${{ secrets.RELEASE_KEYSTORE_PROPERTIES }}" > .sign/keystore.properties.asc
-          gpg -d --passphrase "${{ secrets.PASSPHRASE }}" --batch .sign/keystore.properties.asc > .sign/keystore.properties
-          echo "${{ secrets.ENV_PROPERTIES }}" > .env.properties
-
       - name: Cache Gradle and wrapper
         uses: actions/cache@v3
         with:
@@ -106,8 +99,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3.6.0
         with:
+          distribution: adopt
           java-version: 17
 
       - name: Cache Gradle and wrapper
@@ -148,7 +142,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v3.6.0
         with:
           distribution: 'zulu'
           java-version: 17

diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
@@ -0,0 +1,24 @@
+name: No Response
+
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Every midnight
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: lee-dohm/[email protected]
+        with:
+          token: ${{ github.token }}
+          daysUntilClose: 7
+          responseRequiredLabel: waiting for response
+          closeComment: >
+            This issue has been automatically closed because there has been no response
+            to our request from the original author.
+            Please don't hesitate to comment on the bug if you have
+            any more information for us - we will reopen it right away!
+            Thanks for your contribution.
diff --git a/README.md b/README.md
@@ -44,6 +44,8 @@ If you're interested in customizing the UI components for the Video SDK, check o
 You can find sample projects below that demonstrates use cases of Stream Video SDK for Android:
 
 - [Dogfooding](https://github.com/GetStream/stream-video-android/tree/develop/dogfooding): Dogfooding demonstrates Stream Video SDK for Android with modern Android tech stacks, such as Compose, Hilt, and Coroutines.
+- [WhatsApp Clone Compose](https://github.com/getstream/whatsapp-clone-compose): WhatsApp clone project demonstrates modern Android development built with Jetpack Compose and Stream Chat/Video SDK for Compose.
+- [Twitch Clone Compose](https://github.com/skydoves/twitch-clone-compose): Twitch clone project demonstrates modern Android development built with Jetpack Compose and Stream Chat/Video SDK for Compose.
 - [Meeting Room Compose](https://github.com/GetStream/meeting-room-compose): A real-time meeting room app built with Jetpack Compose to demonstrate video communications.
 
 ## 👩‍💻 Free for Makers 👨‍💻
@@ -135,6 +137,7 @@ Video roadmap and changelog is available [here](https://github.com/GetStream/pro
 - [X] Upgrade to more recent versions of webrtc (Jaewoong/Kanat)
 - [X] Review foreground service vs backend for audio rooms etc. (Aleks)
 - [X] Enable SFU switching
+- [X] Support R8 full mode
 - [ ] Logging is too verbose (rtc is very noisy), clean it up to focus on the essential for info and higher (Daniel)
 
 ### 0.5.0 milestone

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -59,4 +59,12 @@ apply(from = "${rootDir}/scripts/publish-root.gradle")
 //fun teamPropsFile(propsFile: String): File {
 //    val teamPropsDir = file("team-props")
 //    return File(teamPropsDir, propsFile)
-//}
+//}
+
+afterEvaluate {
+    println("Running Add Pre Commit Git Hook Script on Build")
+    exec {
+        commandLine("cp", "./scripts/git-hooks/pre-push", "./.git/hooks")
+    }
+    println("Added pre-push Git Hook Script.")
+}
diff --git a/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt b/buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt
@@ -5,11 +5,11 @@ object Configuration {
     const val targetSdk = 34
     const val minSdk = 24
     const val majorVersion = 0
-    const val minorVersion = 4
-    const val patchVersion = 3
+    const val minorVersion = 5
+    const val patchVersion = 0
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 13
+    const val versionCode = 14
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
-    const val streamVideoCallGooglePlayVersion = "1.0.3"
+    const val streamVideoCallGooglePlayVersion = "1.0.4"
 }
diff --git a/demo-app/README.md b/demo-app/README.md
@@ -48,8 +48,10 @@ If you want to build and run the [dogfooding app](https://github.com/GetStream/s
 ```
 # Environment Variable for dogfooding app
 DOGFOODING_RES_CONFIG_DEEPLINKING_HOST=pronto.getstream.io
-PRODUCTION_RES_CONFIG_DEEPLINKING_HOST=getstream.io
+DOGFOODING_RES_CONFIG_DEEPLINKING_HOST_LEGACY=stream-calls-dogfood.vercel.app
 DOGFOODING_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/
+PRODUCTION_RES_CONFIG_DEEPLINKING_HOST=getstream.io
+PRODUCTION_RES_CONFIG_DEEPLINKING_HOST_LEGACY=
 PRODUCTION_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/video/demos/
 ```
 

diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts
@@ -254,6 +254,7 @@ dependencies {
     // Firebase
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.config)
     implementation(libs.firebase.analytics)
 
     // Moshi

diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
@@ -18,7 +18,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+    <uses-permission
+        android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove" />
 
     <application
         android:name="io.getstream.video.android.App"
@@ -81,15 +83,14 @@
             <intent-filter
                 android:autoVerify="true"
                 android:label="@string/filter_call_link">
-
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="https" />
-                <data android:host="@string/deeplinking_host" />
-                <data android:pathPrefix="@string/deeplinking_path_prefix" />
+                <data android:host="getstream.io" />
+                <data android:host="pronto.getstream.io" />
+                <data android:pathPrefix="/join" />
+                <data android:pathPrefix="/video/demos/join" />
             </intent-filter>
         </activity>
 
@@ -102,6 +103,8 @@
             android:windowSoftInputMode="adjustResize" />
 
         <!-- Prevent firebase from using advertisement ID -->
-        <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="false" />
     </application>
 </manifest>
diff --git a/demo-app/src/main/kotlin/io/getstream/video/android/App.kt b/demo-app/src/main/kotlin/io/getstream/video/android/App.kt
@@ -20,7 +20,6 @@ import android.app.Application
 import android.content.Context
 import dagger.hilt.android.HiltAndroidApp
 import io.getstream.video.android.datastore.delegate.StreamUserDataStore
-import io.getstream.video.android.tooling.util.StreamFlavors
 import io.getstream.video.android.util.StreamVideoInitHelper
 import kotlinx.coroutines.runBlocking
 
@@ -55,6 +54,4 @@ class App : Application() {
     }
 }
 
-val STREAM_SDK_ENVIRONMENT = if (BuildConfig.FLAVOR == StreamFlavors.production) "demo" else "pronto"
-
 val Context.app get() = applicationContext as App