Skip to content
Draft
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
8 changes: 4 additions & 4 deletions existing/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion existing/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion flutter_module/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion kmp/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions kmp/kmp.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion kmp/migration/KmpMigration.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
5 changes: 2 additions & 3 deletions kmp/migration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ plugins {
kotlin {
// This will be used in React Native
js {
moduleName = "kmp-migration"
outputModuleName.set("kmp-migration")
binaries.executable()
generateTypeScriptDefinitions()
nodejs()
useEsModules()
}
// Android and iOS using the same code
jvm {
withJava()
testRuns.named("test") {
executionTask.configure {
useJUnitPlatform()
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions native/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions native/android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion native/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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