Skip to content

Commit e9fec70

Browse files
Merge branch 'refs/heads/develop'
2 parents 94b4a76 + 7080ea2 commit e9fec70

File tree

31 files changed

+327
-150
lines changed

31 files changed

+327
-150
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ jobs:
120120
./gradlew :stream-video-android-core:testDebugUnitTest --scan --stacktrace
121121
122122
- name: Unit tests core results
123-
uses: actions/upload-artifact@v2
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: unit-tests-core-results
126126
path: stream-video-android-core/build/reports/tests/testDebugUnitTest/index.html
127127

128128
- name: Unit tests compose results
129-
uses: actions/upload-artifact@v2
129+
uses: actions/upload-artifact@v4
130130
with:
131131
name: unit-tests-compose-results
132132
path: stream-video-android-ui-compose/build/reports/tests/testDebugUnitTest/index.html

.github/workflows/app-distribute.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Assemble
2828
run: bash ./gradlew :demo-app:assembleRelease --stacktrace
2929
- name: Upload APK
30-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: demo-app-release
3333
path: demo-app/build/outputs/apk/demo-app/release/

.github/workflows/artifact-upload.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: ./gradlew bundleRelease --stacktrace
3636

3737
- name: Upload AAB as artifact
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: app-bundle
4141
path: demo-app/build/outputs/bundle/productionRelease/demo-app-production-release.aab

build-logic/convention/src/main/kotlin/io/getstream/video/AndroidCompose.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.configure
88
import org.gradle.kotlin.dsl.dependencies
99
import org.gradle.kotlin.dsl.getByType
1010
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
11+
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
1112

1213
/**
1314
* Configure Compose-specific options
@@ -31,7 +32,7 @@ internal fun Project.configureAndroidCompose(
3132
}
3233

3334
extensions.configure<ComposeCompilerGradlePluginExtension> {
34-
enableStrongSkippingMode = true
35+
featureFlags.addAll(ComposeFeatureFlag.StrongSkipping, ComposeFeatureFlag.IntrinsicRemember)
3536
reportsDestination = layout.buildDirectory.dir("compose_compiler")
3637
stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
3738
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ object Configuration {
66
const val minSdk = 24
77
const val majorVersion = 1
88
const val minorVersion = 0
9-
const val patchVersion = 13
9+
const val patchVersion = 14
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 37
11+
const val versionCode = 38
1212
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
1313
const val artifactGroup = "io.getstream"
14-
const val streamVideoCallGooglePlayVersion = "1.1.6"
14+
const val streamVideoCallGooglePlayVersion = "1.1.7"
1515
const val streamWebRtcVersionName = "1.1.1"
1616
}

demo-app/src/main/kotlin/io/getstream/video/android/ui/call/LandscapeControls.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import androidx.compose.material.icons.filled.CallEnd
2929
import androidx.compose.runtime.Composable
3030
import androidx.compose.runtime.getValue
3131
import androidx.compose.ui.Alignment
32-
import androidx.compose.ui.ExperimentalComposeUiApi
3332
import androidx.compose.ui.Modifier
3433
import androidx.compose.ui.platform.LocalContext
3534
import androidx.compose.ui.tooling.preview.Preview
@@ -48,7 +47,6 @@ import io.getstream.video.android.mock.StreamPreviewDataUtils
4847
import io.getstream.video.android.mock.previewCall
4948
import io.getstream.video.android.tooling.extensions.toPx
5049

51-
@OptIn(ExperimentalComposeUiApi::class)
5250
@Composable
5351
fun LandscapeControls(call: Call, onDismiss: () -> Unit) {
5452
val isCameraEnabled by call.camera.isEnabled.collectAsStateWithLifecycle()

demo-app/src/main/kotlin/io/getstream/video/android/ui/call/LayoutChooser.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(ExperimentalLayoutApi::class)
18-
1917
package io.getstream.video.android.ui.call
2018

2119
import androidx.compose.foundation.background
2220
import androidx.compose.foundation.layout.Column
23-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
2421
import androidx.compose.foundation.layout.width
2522
import androidx.compose.material.icons.Icons
2623
import androidx.compose.material.icons.filled.AutoAwesome

demo-app/src/main/kotlin/io/getstream/video/android/ui/call/ParticipantsDialog.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package io.getstream.video.android.ui.call
1818

1919
import android.content.ClipboardManager
2020
import android.content.Context
21-
import androidx.compose.foundation.ExperimentalFoundationApi
2221
import androidx.compose.foundation.background
2322
import androidx.compose.foundation.layout.Arrangement
2423
import androidx.compose.foundation.layout.Box
@@ -100,7 +99,6 @@ fun ParticipantsList(call: Call) {
10099
ParticipantsListContent(call, clipboardManager, participants)
101100
}
102101

103-
@OptIn(ExperimentalFoundationApi::class)
104102
@Composable
105103
fun ParticipantsListContent(
106104
call: Call,

demo-app/src/main/kotlin/io/getstream/video/android/ui/login/LoginScreen.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
2727
import androidx.compose.foundation.layout.Arrangement
2828
import androidx.compose.foundation.layout.Box
2929
import androidx.compose.foundation.layout.Column
30-
import androidx.compose.foundation.layout.ExperimentalLayoutApi
3130
import androidx.compose.foundation.layout.Row
3231
import androidx.compose.foundation.layout.Spacer
3332
import androidx.compose.foundation.layout.fillMaxSize
@@ -48,7 +47,7 @@ import androidx.compose.material.icons.filled.Email
4847
import androidx.compose.material.icons.filled.Settings
4948
import androidx.compose.material.icons.outlined.Adb
5049
import androidx.compose.material.icons.outlined.GroupAdd
51-
import androidx.compose.material.ripple.rememberRipple
50+
import androidx.compose.material.ripple
5251
import androidx.compose.runtime.Composable
5352
import androidx.compose.runtime.LaunchedEffect
5453
import androidx.compose.runtime.collectAsState
@@ -408,7 +407,7 @@ private fun BuiltInUsersLoginDialog(
408407
.fillMaxWidth()
409408
.clickable(
410409
interactionSource = remember { MutableInteractionSource() },
411-
indication = rememberRipple(bounded = true),
410+
indication = ripple(bounded = true),
412411
onClick = {
413412
login(true, LoginEvent.SignIn(user))
414413
onDismissRequest()
@@ -439,7 +438,6 @@ private fun BuiltInUsersLoginDialog(
439438
)
440439
}
441440

442-
@OptIn(ExperimentalLayoutApi::class)
443441
@Composable
444442
fun SelectableDialog(
445443
items: List<StreamEnvironment>,

demo-app/src/main/kotlin/io/getstream/video/android/ui/menu/SettingsMenu.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import androidx.compose.runtime.getValue
3939
import androidx.compose.runtime.remember
4040
import androidx.compose.runtime.rememberCoroutineScope
4141
import androidx.compose.ui.Alignment
42-
import androidx.compose.ui.ExperimentalComposeUiApi
4342
import androidx.compose.ui.Modifier
4443
import androidx.compose.ui.platform.LocalContext
4544
import androidx.compose.ui.tooling.preview.Preview
@@ -63,7 +62,7 @@ import io.getstream.video.android.util.filters.SampleAudioFilter
6362
import kotlinx.coroutines.launch
6463
import java.nio.ByteBuffer
6564

66-
@OptIn(ExperimentalComposeUiApi::class, ExperimentalPermissionsApi::class)
65+
@OptIn(ExperimentalPermissionsApi::class)
6766
@Composable
6867
internal fun SettingsMenu(
6968
call: Call,

0 commit comments

Comments
 (0)