From f2dfb2e182947313d15d94cbad09dac39a8c0515 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Fri, 6 Mar 2026 11:46:02 -0300 Subject: [PATCH 1/4] Update Gradle, Kotlin, and Java versions - Upgrade Gradle to 8.11.1. - Upgrade Kotlin to 2.3.10 and KSP to 2.3.5. - Upgrade Android Gradle Plugin to 8.7.3. - Update project configuration to use Java 21 and JVM target 21. - Remove `kotlin-kapt` plugin from library and application build scripts. --- build-logic/src/main/java/Config.kt | 5 +++++ .../src/main/java/com.streamplayer.application.gradle.kts | 5 +---- .../src/main/java/com.streamplayer.kmp-library.gradle.kts | 1 - build-logic/src/main/java/extensions/CommonExtensions.kt | 7 ++----- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 5 +++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build-logic/src/main/java/Config.kt b/build-logic/src/main/java/Config.kt index ede08d28..f8d38d8c 100644 --- a/build-logic/src/main/java/Config.kt +++ b/build-logic/src/main/java/Config.kt @@ -1,6 +1,11 @@ +import org.gradle.api.JavaVersion +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + object Config { const val appName = "streamplayerapp" const val applicationId = "com.codandotv.$appName" + val jvmTarget = JvmTarget.JVM_21 + val javaVersion = JavaVersion.VERSION_21 const val compileSdkVersion = 35 const val minSdkVersion = 28 const val targetSdkVersion = 35 diff --git a/build-logic/src/main/java/com.streamplayer.application.gradle.kts b/build-logic/src/main/java/com.streamplayer.application.gradle.kts index 95839dff..d55c2f8d 100644 --- a/build-logic/src/main/java/com.streamplayer.application.gradle.kts +++ b/build-logic/src/main/java/com.streamplayer.application.gradle.kts @@ -6,15 +6,12 @@ import extensions.iosTarget import extensions.setupAndroidDefaultConfig import extensions.setupCompileOptions import extensions.setupPackingOptions -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.JvmTarget val libs: VersionCatalog = extensions.getByType().named("libs") plugins { id("com.android.application") id("org.jetbrains.kotlin.multiplatform") - id("kotlin-kapt") id("kotlin-parcelize") id("com.streamplayer.dokka") id("com.streamplayer.detekt") @@ -24,7 +21,7 @@ val catalog: VersionCatalog = extensions.getByType().n kotlin { androidTarget { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(Config.jvmTarget) } } diff --git a/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts b/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts index e7f9b563..b781e085 100644 --- a/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts +++ b/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts @@ -16,7 +16,6 @@ plugins { id("org.jetbrains.kotlin.multiplatform") id("com.android.library") id("org.jetbrains.kotlin.plugin.serialization") - id("kotlin-kapt") id("kotlin-parcelize") id("com.streamplayer.dokka") id("com.streamplayer.detekt") diff --git a/build-logic/src/main/java/extensions/CommonExtensions.kt b/build-logic/src/main/java/extensions/CommonExtensions.kt index c7b9246d..6411ce63 100644 --- a/build-logic/src/main/java/extensions/CommonExtensions.kt +++ b/build-logic/src/main/java/extensions/CommonExtensions.kt @@ -1,10 +1,7 @@ -@file:Suppress("UnstableApiUsage") - package extensions import Config import com.android.build.api.dsl.CommonExtension -import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalog import org.gradle.api.artifacts.VersionCatalogsExtension @@ -38,8 +35,8 @@ internal fun CommonExtension<*, *, *, *, *, *>.setupAndroidDefaultConfig() { internal fun CommonExtension<*, *, *, *, *, *>.setupCompileOptions() { compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = Config.javaVersion + targetCompatibility = Config.javaVersion } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6e0d9001..ae5c5652 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -kotlin = "2.1.10" -android_gradle_plugin = "8.7.2" +kotlin = "2.3.10" +android_gradle_plugin = "8.7.3" koin = "4.0.1" -ksp = "2.1.10-1.0.29" +ksp = "2.3.5" dokka = "1.9.10" detekt = "1.23.6" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 960f6e70..f6742b47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ -#Wed Feb 19 11:41:18 BRT 2025 +#Thu Mar 05 21:58:53 BRT 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From b94270b3b0d7055ccad96aafa4f9a3e824065030 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Fri, 6 Mar 2026 11:48:06 -0300 Subject: [PATCH 2/4] Remove not necessary file --- build/kotlin/commonizedNativeDistributionLocation.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 build/kotlin/commonizedNativeDistributionLocation.txt diff --git a/build/kotlin/commonizedNativeDistributionLocation.txt b/build/kotlin/commonizedNativeDistributionLocation.txt deleted file mode 100644 index 9f81b5aa..00000000 --- a/build/kotlin/commonizedNativeDistributionLocation.txt +++ /dev/null @@ -1 +0,0 @@ -/Users/junior/.konan/kotlin-native-prebuilt-macos-aarch64-2.1.10/klib/commonized/2.1.10 \ No newline at end of file From 0a6ab2dc3dfb75f11b2c58cc170624d715566565 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Fri, 6 Mar 2026 11:49:01 -0300 Subject: [PATCH 3/4] Add kotzilla.json to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e599ccf5..0d7cd51e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ .cxx .kotlin local.properties +/composeApp/kotzilla.json From c6bd8ca1475bc43ed40bcfcaa827943f394da6c2 Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Fri, 6 Mar 2026 13:01:14 -0300 Subject: [PATCH 4/4] Fixing bugs on iOS to use jdk 21 --- .../src/main/java/com.streamplayer.application.gradle.kts | 2 ++ .../src/main/java/com.streamplayer.kmp-library.gradle.kts | 4 +++- iosApp/iosApp.xcodeproj/project.pbxproj | 6 ++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-logic/src/main/java/com.streamplayer.application.gradle.kts b/build-logic/src/main/java/com.streamplayer.application.gradle.kts index d55c2f8d..edc57f06 100644 --- a/build-logic/src/main/java/com.streamplayer.application.gradle.kts +++ b/build-logic/src/main/java/com.streamplayer.application.gradle.kts @@ -19,6 +19,8 @@ plugins { val catalog: VersionCatalog = extensions.getByType().named("libs") kotlin { + jvmToolchain(21) + androidTarget { compilerOptions { jvmTarget.set(Config.jvmTarget) diff --git a/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts b/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts index b781e085..93e8406c 100644 --- a/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts +++ b/build-logic/src/main/java/com.streamplayer.kmp-library.gradle.kts @@ -22,9 +22,11 @@ plugins { } kotlin { + jvmToolchain(21) + androidTarget { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(Config.jvmTarget) freeCompilerArgs.add("-Xstring-concat=inline") } } diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 1dde3c3b..b04da153 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -57,7 +57,6 @@ 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; 3FD330BB2DD2CFC300633ECC /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 5BA9B50A2DA8871200EF12ED /* iosApp.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = iosApp.xctestplan; sourceTree = SOURCE_ROOT; }; 5BA9B50C2DA887EE00EF12ED /* iosApp.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = iosApp.xctestplan; path = iosAppTests/iosApp.xctestplan; sourceTree = SOURCE_ROOT; }; 5BA9B5112DA889A300EF12ED /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 5BA9B5132DA889A300EF12ED /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = ""; }; @@ -162,7 +161,6 @@ 3FD330BB2DD2CFC300633ECC /* GoogleService-Info.plist */, 5BAD97862D7CCDDA00D93987 /* Lottie.swift */, 5BA9B50C2DA887EE00EF12ED /* iosApp.xctestplan */, - 5BA9B50A2DA8871200EF12ED /* iosApp.xctestplan */, 058557BA273AAA24004C7B11 /* Assets.xcassets */, 7555FF82242A565900829871 /* ContentView.swift */, 7555FF8C242A565B00829871 /* Info.plist */, @@ -371,7 +369,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ABCDE12345; + DEVELOPMENT_TEAM = P8ZZXHC5BB; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -541,7 +539,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = 4U9U2835SF; + DEVELOPMENT_TEAM = P8ZZXHC5BB; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)",