diff --git a/existing/android/build.gradle b/existing/android/build.gradle index a9ea023..ce6c7a0 100644 --- a/existing/android/build.gradle +++ b/existing/android/build.gradle @@ -2,10 +2,10 @@ buildscript { ext { buildToolsVersion = "35.0.0" minSdkVersion = 24 - compileSdkVersion = 35 - targetSdkVersion = 34 - ndkVersion = "26.1.10909125" - kotlinVersion = "1.9.24" + compileSdkVersion = 36 + targetSdkVersion = 36 + ndkVersion = "27.2.12479018" + kotlinVersion = "2.3.0" } repositories { google() diff --git a/existing/android/gradle/wrapper/gradle-wrapper.properties b/existing/android/gradle/wrapper/gradle-wrapper.properties index 79eb9d0..e0fd020 100644 --- a/existing/android/gradle/wrapper/gradle-wrapper.properties +++ b/existing/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/flutter_module/pubspec.yaml b/flutter_module/pubspec.yaml index fdddfb3..4674751 100644 --- a/flutter_module/pubspec.yaml +++ b/flutter_module/pubspec.yaml @@ -18,7 +18,7 @@ description: "A new Flutter module project." version: 1.0.0+1 environment: - sdk: ^3.5.4 + sdk: ^3.6.0 dependencies: flutter: diff --git a/kmp/gradle/wrapper/gradle-wrapper.properties b/kmp/gradle/wrapper/gradle-wrapper.properties index 09523c0..cea7a79 100644 --- a/kmp/gradle/wrapper/gradle-wrapper.properties +++ b/kmp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/kmp/kmp.versions.toml b/kmp/kmp.versions.toml index 2077fbe..df73a34 100644 --- a/kmp/kmp.versions.toml +++ b/kmp/kmp.versions.toml @@ -1,11 +1,11 @@ [versions] -kotlin = "2.0.21" -ktor = "2.3.12" +kotlin = "2.3.0" +ktor = "3.0.3" serialization-version = "1.7.3" coroutines = "1.9.0" # compose -compose-version = "1.7.0" +compose-version = "1.7.3" androidx-lifecycle = "2.8.3" [libraries] diff --git a/kmp/migration/KmpMigration.podspec b/kmp/migration/KmpMigration.podspec index 6580e6a..381e3d4 100644 --- a/kmp/migration/KmpMigration.podspec +++ b/kmp/migration/KmpMigration.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.summary = 'KMP Migration' spec.vendored_frameworks = 'build/cocoapods/framework/KmpMigration.framework' spec.libraries = 'c++' - spec.ios.deployment_target = '14.0' + spec.ios.deployment_target = '15.0' if !Dir.exist?('build/cocoapods/framework/KmpMigration.framework') || Dir.empty?('build/cocoapods/framework/KmpMigration.framework') diff --git a/kmp/migration/build.gradle.kts b/kmp/migration/build.gradle.kts index c6a3a2f..aca1160 100644 --- a/kmp/migration/build.gradle.kts +++ b/kmp/migration/build.gradle.kts @@ -12,7 +12,7 @@ plugins { kotlin { // This will be used in React Native js { - moduleName = "kmp-migration" + outputModuleName.set("kmp-migration") binaries.executable() generateTypeScriptDefinitions() nodejs() @@ -20,7 +20,6 @@ kotlin { } // Android and iOS using the same code jvm { - withJava() testRuns.named("test") { executionTask.configure { useJUnitPlatform() @@ -47,7 +46,7 @@ kotlin { summary = "KMP Migration" homepage = "https://github.com/HenryQuan/react-native-kmp-migration" name = "KmpMigration" - ios.deploymentTarget = "14.0" + ios.deploymentTarget = "15.0" framework { baseName = "KmpMigration" // the name of the framework isStatic = true // avoid dynamic framework diff --git a/native/android/app/build.gradle.kts b/native/android/app/build.gradle.kts index 9aa0944..cb87459 100644 --- a/native/android/app/build.gradle.kts +++ b/native/android/app/build.gradle.kts @@ -7,12 +7,12 @@ plugins { android { namespace = "org.github.henryquan.nativeandroidkmp" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "org.github.henryquan.nativeandroidkmp" minSdk = 26 - targetSdk = 34 + targetSdk = 36 versionCode = 2 versionName = "1.1" diff --git a/native/android/gradle/libs.versions.toml b/native/android/gradle/libs.versions.toml index b3b20bb..7e005d0 100644 --- a/native/android/gradle/libs.versions.toml +++ b/native/android/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -agp = "8.7.2" -kotlin = "2.0.21" +agp = "8.8.0" +kotlin = "2.3.0" coreKtx = "1.15.0" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" lifecycleRuntimeKtx = "2.8.7" activityCompose = "1.9.3" -composeBom = "2024.10.01" -composeNavigation = "2.8.3" +composeBom = "2024.12.01" +composeNavigation = "2.8.5" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/native/android/gradle/wrapper/gradle-wrapper.properties b/native/android/gradle/wrapper/gradle-wrapper.properties index 9e1fffb..82cd158 100644 --- a/native/android/gradle/wrapper/gradle-wrapper.properties +++ b/native/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Nov 02 11:29:34 AEDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists