Skip to content

Bump dependencies to new versions #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions webrtc-android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import java.io.FileInputStream
import java.util.Properties

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
id(libs.plugins.android.application.get().pluginId)
id(libs.plugins.kotlin.android.get().pluginId)
id(libs.plugins.compose.compiler.get().pluginId)
}

val localProperties = Properties()
localProperties.load(FileInputStream(rootProject.file("local.properties")))

android {
namespace = "io.getstream.webrtc.sample.compose"
compileSdk = Configurations.compileSdk
Expand All @@ -20,7 +25,7 @@ android {
buildConfigField(
"String",
"SIGNALING_SERVER_IP_ADDRESS",
"\"" + gradleLocalProperties(rootDir).getProperty("SIGNALING_SERVER_IP_ADDRESS", "") + "\""
localProperties["SIGNALING_SERVER_IP_ADDRESS"].toString()
)
}

Expand All @@ -33,10 +38,6 @@ android {
buildConfig = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}

packagingOptions {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
Expand Down
1 change: 1 addition & 0 deletions webrtc-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.spotless) apply false
}

Expand Down
4 changes: 2 additions & 2 deletions webrtc-android/buildSrc/src/main/kotlin/Configurations.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
object Configurations {
const val compileSdk = 34
const val targetSdk = 34
const val compileSdk = 35
const val targetSdk = 35
const val minSdk = 23
const val majorVersion = 1
const val minorVersion = 0
Expand Down
34 changes: 17 additions & 17 deletions webrtc-android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
[versions]
streamLog = "1.1.4"
landscapist = "2.2.10"
webrtc = "1.1.0"
androidGradlePlugin = "8.1.2"
androidxActivity = "1.8.0"
androidxAppCompat = "1.6.1"
androidxCompose = "1.5.4"
androidxComposeCompiler = "1.5.3"
androidxComposeMaterial3 = "1.1.2"
androidxComposeConstraintLayout = "1.0.1"
androidxComposeNavigation = "2.7.4"
androidxCore = "1.12.0"
androidxLifecycle = "2.6.2"
landscapist = "2.4.2"
webrtc = "1.3.0"
androidGradlePlugin = "8.3.2"
androidxActivity = "1.9.3"
androidxAppCompat = "1.7.0"
androidxCompose = "1.7.5"
androidxComposeMaterial3 = "1.3.1"
androidxComposeConstraintLayout = "1.1.0"
androidxComposeNavigation = "2.8.4"
androidxCore = "1.15.0"
androidxLifecycle = "2.8.7"
androidxNavigation = "2.5.0"
kotlin = "1.9.10"
kotlinxCoroutines = "1.7.3"
kotlinxSerializationJson = "1.6.0"
kotlin = "2.0.21"
kotlinxCoroutines = "1.9.0"
kotlinxSerializationJson = "1.7.3"
ktlint = "0.43.0"
okhttp = "4.12.0"
retrofit = "2.9.0"
retrofitResultAdapter = "1.0.9"
retrofit = "2.11.0"
retrofitResultAdapter = "1.0.10"
retrofitKotlinxSerializationJson = "1.0.0"
spotless = "6.7.0"

Expand Down Expand Up @@ -61,6 +60,7 @@ spotless-gradlePlugin = { group = "com.diffplug.spotless", name = "spotless-plug
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
2 changes: 1 addition & 1 deletion webrtc-android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 19 09:43:34 KST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading