Skip to content

Commit a35b030

Browse files
authored
Merge pull request #10 from GetStream/update/dpes
Bump dependencies to new versions
2 parents 7de0968 + c587c57 commit a35b030

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

webrtc-android/app/build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
1+
import java.io.FileInputStream
2+
import java.util.Properties
23

34
@Suppress("DSL_SCOPE_VIOLATION")
45
plugins {
56
id(libs.plugins.android.application.get().pluginId)
67
id(libs.plugins.kotlin.android.get().pluginId)
8+
id(libs.plugins.compose.compiler.get().pluginId)
79
}
810

11+
val localProperties = Properties()
12+
localProperties.load(FileInputStream(rootProject.file("local.properties")))
13+
914
android {
1015
namespace = "io.getstream.webrtc.sample.compose"
1116
compileSdk = Configurations.compileSdk
@@ -20,7 +25,7 @@ android {
2025
buildConfigField(
2126
"String",
2227
"SIGNALING_SERVER_IP_ADDRESS",
23-
"\"" + gradleLocalProperties(rootDir).getProperty("SIGNALING_SERVER_IP_ADDRESS", "") + "\""
28+
localProperties["SIGNALING_SERVER_IP_ADDRESS"].toString()
2429
)
2530
}
2631

@@ -33,10 +38,6 @@ android {
3338
buildConfig = true
3439
}
3540

36-
composeOptions {
37-
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
38-
}
39-
4041
packagingOptions {
4142
resources {
4243
excludes.add("/META-INF/{AL2.0,LGPL2.1}")

webrtc-android/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
alias(libs.plugins.android.application) apply false
1010
alias(libs.plugins.kotlin.jvm) apply false
1111
alias(libs.plugins.kotlin.serialization) apply false
12+
alias(libs.plugins.compose.compiler) apply false
1213
alias(libs.plugins.spotless) apply false
1314
}
1415

webrtc-android/buildSrc/src/main/kotlin/Configurations.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Configurations {
2-
const val compileSdk = 34
3-
const val targetSdk = 34
2+
const val compileSdk = 35
3+
const val targetSdk = 35
44
const val minSdk = 23
55
const val majorVersion = 1
66
const val minorVersion = 0

webrtc-android/gradle/libs.versions.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
[versions]
22
streamLog = "1.1.4"
3-
landscapist = "2.2.10"
4-
webrtc = "1.1.0"
5-
androidGradlePlugin = "8.1.2"
6-
androidxActivity = "1.8.0"
7-
androidxAppCompat = "1.6.1"
8-
androidxCompose = "1.5.4"
9-
androidxComposeCompiler = "1.5.3"
10-
androidxComposeMaterial3 = "1.1.2"
11-
androidxComposeConstraintLayout = "1.0.1"
12-
androidxComposeNavigation = "2.7.4"
13-
androidxCore = "1.12.0"
14-
androidxLifecycle = "2.6.2"
3+
landscapist = "2.4.2"
4+
webrtc = "1.3.0"
5+
androidGradlePlugin = "8.3.2"
6+
androidxActivity = "1.9.3"
7+
androidxAppCompat = "1.7.0"
8+
androidxCompose = "1.7.5"
9+
androidxComposeMaterial3 = "1.3.1"
10+
androidxComposeConstraintLayout = "1.1.0"
11+
androidxComposeNavigation = "2.8.4"
12+
androidxCore = "1.15.0"
13+
androidxLifecycle = "2.8.7"
1514
androidxNavigation = "2.5.0"
16-
kotlin = "1.9.10"
17-
kotlinxCoroutines = "1.7.3"
18-
kotlinxSerializationJson = "1.6.0"
15+
kotlin = "2.0.21"
16+
kotlinxCoroutines = "1.9.0"
17+
kotlinxSerializationJson = "1.7.3"
1918
ktlint = "0.43.0"
2019
okhttp = "4.12.0"
21-
retrofit = "2.9.0"
22-
retrofitResultAdapter = "1.0.9"
20+
retrofit = "2.11.0"
21+
retrofitResultAdapter = "1.0.10"
2322
retrofitKotlinxSerializationJson = "1.0.0"
2423
spotless = "6.7.0"
2524

@@ -61,6 +60,7 @@ spotless-gradlePlugin = { group = "com.diffplug.spotless", name = "spotless-plug
6160
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
6261
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
6362
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
63+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
6464
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
6565
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
6666
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Oct 19 09:43:34 KST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)