Skip to content

Commit 39106b8

Browse files
committed
Merge branch 'develop'
2 parents c72d96b + 33ba422 commit 39106b8

File tree

79 files changed

+2808
-787
lines changed

Some content is hidden

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

79 files changed

+2808
-787
lines changed

.github/workflows/android.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Check out code
2222
uses: actions/checkout@v3.1.0
2323
- name: Set up JDK
24-
uses: actions/setup-java@v3.5.1
24+
uses: actions/setup-java@v3.6.0
2525
with:
2626
distribution: adopt
2727
java-version: 17
@@ -54,7 +54,7 @@ jobs:
5454
- name: Check out code
5555
uses: actions/checkout@v3.1.0
5656
- name: Set up JDK
57-
uses: actions/setup-java@v3.5.1
57+
uses: actions/setup-java@v3.6.0
5858
with:
5959
distribution: adopt
6060
java-version: 17
@@ -67,18 +67,11 @@ jobs:
6767
- uses: actions/checkout@v3
6868

6969
- name: set up JDK
70-
uses: actions/setup-java@v1
70+
uses: actions/setup-java@v3.6.0
7171
with:
72+
distribution: adopt
7273
java-version: 17
7374

74-
- name: Prepare environment
75-
run: |
76-
echo "${{ secrets.RELEASE_KEYSTORE }}" > .sign/release.keystore.asc
77-
gpg -d --passphrase "${{ secrets.PASSPHRASE }}" --batch .sign/release.keystore.asc > .sign/release.keystore
78-
echo "${{ secrets.RELEASE_KEYSTORE_PROPERTIES }}" > .sign/keystore.properties.asc
79-
gpg -d --passphrase "${{ secrets.PASSPHRASE }}" --batch .sign/keystore.properties.asc > .sign/keystore.properties
80-
echo "${{ secrets.ENV_PROPERTIES }}" > .env.properties
81-
8275
- name: Cache Gradle and wrapper
8376
uses: actions/cache@v3
8477
with:
@@ -106,8 +99,9 @@ jobs:
10699
uses: actions/checkout@v3
107100

108101
- name: set up JDK
109-
uses: actions/setup-java@v1
102+
uses: actions/setup-java@v3.6.0
110103
with:
104+
distribution: adopt
111105
java-version: 17
112106

113107
- name: Cache Gradle and wrapper
@@ -148,7 +142,7 @@ jobs:
148142
uses: actions/checkout@v3
149143

150144
- name: Set up JDK 17
151-
uses: actions/setup-java@v3
145+
uses: actions/setup-java@v3.6.0
152146
with:
153147
distribution: 'zulu'
154148
java-version: 17

.github/workflows/no-response.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: No Response
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
schedule:
7+
# Every midnight
8+
- cron: '0 0 * * *'
9+
10+
jobs:
11+
noResponse:
12+
runs-on: ubuntu-22.04
13+
steps:
14+
- uses: lee-dohm/no-response@v0.5.0
15+
with:
16+
token: ${{ github.token }}
17+
daysUntilClose: 7
18+
responseRequiredLabel: waiting for response
19+
closeComment: >
20+
This issue has been automatically closed because there has been no response
21+
to our request from the original author.
22+
Please don't hesitate to comment on the bug if you have
23+
any more information for us - we will reopen it right away!
24+
Thanks for your contribution.

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ If you're interested in customizing the UI components for the Video SDK, check o
4444
You can find sample projects below that demonstrates use cases of Stream Video SDK for Android:
4545

4646
- [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.
47+
- [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.
48+
- [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.
4749
- [Meeting Room Compose](https://github.com/GetStream/meeting-room-compose): A real-time meeting room app built with Jetpack Compose to demonstrate video communications.
4850

4951
## 👩‍💻 Free for Makers 👨‍💻
@@ -135,6 +137,7 @@ Video roadmap and changelog is available [here](https://github.com/GetStream/pro
135137
- [X] Upgrade to more recent versions of webrtc (Jaewoong/Kanat)
136138
- [X] Review foreground service vs backend for audio rooms etc. (Aleks)
137139
- [X] Enable SFU switching
140+
- [X] Support R8 full mode
138141
- [ ] Logging is too verbose (rtc is very noisy), clean it up to focus on the essential for info and higher (Daniel)
139142

140143
### 0.5.0 milestone

build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,12 @@ apply(from = "${rootDir}/scripts/publish-root.gradle")
5959
//fun teamPropsFile(propsFile: String): File {
6060
// val teamPropsDir = file("team-props")
6161
// return File(teamPropsDir, propsFile)
62-
//}
62+
//}
63+
64+
afterEvaluate {
65+
println("Running Add Pre Commit Git Hook Script on Build")
66+
exec {
67+
commandLine("cp", "./scripts/git-hooks/pre-push", "./.git/hooks")
68+
}
69+
println("Added pre-push Git Hook Script.")
70+
}

buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ object Configuration {
55
const val targetSdk = 34
66
const val minSdk = 24
77
const val majorVersion = 0
8-
const val minorVersion = 4
9-
const val patchVersion = 3
8+
const val minorVersion = 5
9+
const val patchVersion = 0
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 13
11+
const val versionCode = 14
1212
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
1313
const val artifactGroup = "io.getstream"
14-
const val streamVideoCallGooglePlayVersion = "1.0.3"
14+
const val streamVideoCallGooglePlayVersion = "1.0.4"
1515
}

demo-app/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ If you want to build and run the [dogfooding app](https://github.com/GetStream/s
4848
```
4949
# Environment Variable for dogfooding app
5050
DOGFOODING_RES_CONFIG_DEEPLINKING_HOST=pronto.getstream.io
51-
PRODUCTION_RES_CONFIG_DEEPLINKING_HOST=getstream.io
51+
DOGFOODING_RES_CONFIG_DEEPLINKING_HOST_LEGACY=stream-calls-dogfood.vercel.app
5252
DOGFOODING_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/
53+
PRODUCTION_RES_CONFIG_DEEPLINKING_HOST=getstream.io
54+
PRODUCTION_RES_CONFIG_DEEPLINKING_HOST_LEGACY=
5355
PRODUCTION_RES_CONFIG_DEEPLINKING_PATH_PREFIX=/video/demos/
5456
```
5557

demo-app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ dependencies {
254254
// Firebase
255255
implementation(platform(libs.firebase.bom))
256256
implementation(libs.firebase.crashlytics)
257+
implementation(libs.firebase.config)
257258
implementation(libs.firebase.analytics)
258259

259260
// Moshi

demo-app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
xmlns:tools="http://schemas.android.com/tools">
1919

2020
<uses-permission android:name="android.permission.INTERNET" />
21-
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
21+
<uses-permission
22+
android:name="com.google.android.gms.permission.AD_ID"
23+
tools:node="remove" />
2224

2325
<application
2426
android:name="io.getstream.video.android.App"
@@ -81,15 +83,14 @@
8183
<intent-filter
8284
android:autoVerify="true"
8385
android:label="@string/filter_call_link">
84-
8586
<action android:name="android.intent.action.VIEW" />
86-
8787
<category android:name="android.intent.category.DEFAULT" />
8888
<category android:name="android.intent.category.BROWSABLE" />
89-
9089
<data android:scheme="https" />
91-
<data android:host="@string/deeplinking_host" />
92-
<data android:pathPrefix="@string/deeplinking_path_prefix" />
90+
<data android:host="getstream.io" />
91+
<data android:host="pronto.getstream.io" />
92+
<data android:pathPrefix="/join" />
93+
<data android:pathPrefix="/video/demos/join" />
9394
</intent-filter>
9495
</activity>
9596

@@ -102,6 +103,8 @@
102103
android:windowSoftInputMode="adjustResize" />
103104

104105
<!-- Prevent firebase from using advertisement ID -->
105-
<meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
106+
<meta-data
107+
android:name="google_analytics_adid_collection_enabled"
108+
android:value="false" />
106109
</application>
107110
</manifest>

demo-app/src/main/kotlin/io/getstream/video/android/App.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import android.app.Application
2020
import android.content.Context
2121
import dagger.hilt.android.HiltAndroidApp
2222
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
23-
import io.getstream.video.android.tooling.util.StreamFlavors
2423
import io.getstream.video.android.util.StreamVideoInitHelper
2524
import kotlinx.coroutines.runBlocking
2625

@@ -55,6 +54,4 @@ class App : Application() {
5554
}
5655
}
5756

58-
val STREAM_SDK_ENVIRONMENT = if (BuildConfig.FLAVOR == StreamFlavors.production) "demo" else "pronto"
59-
6057
val Context.app get() = applicationContext as App

0 commit comments

Comments
 (0)