diff --git a/Example/android/build.gradle b/Example/android/build.gradle index b2847cb0d0..d8db26d635 100644 --- a/Example/android/build.gradle +++ b/Example/android/build.gradle @@ -7,7 +7,7 @@ buildscript { compileSdkVersion = 33 targetSdkVersion = 33 ndkVersion = "23.1.7779620" - kotlinVersion = "1.6.21" + kotlinVersion = "1.8.22" } repositories { google() diff --git a/FabricExample/android/build.gradle b/FabricExample/android/build.gradle index 34ea718194..9f0d8bf281 100644 --- a/FabricExample/android/build.gradle +++ b/FabricExample/android/build.gradle @@ -9,6 +9,7 @@ buildscript { // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" + kotlinVersion = "1.8.22" } repositories { google() diff --git a/FabricTestExample/android/build.gradle b/FabricTestExample/android/build.gradle index 34ea718194..9f0d8bf281 100644 --- a/FabricTestExample/android/build.gradle +++ b/FabricTestExample/android/build.gradle @@ -9,6 +9,7 @@ buildscript { // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" + kotlinVersion = "1.8.22" } repositories { google() diff --git a/TestsExample/android/build.gradle b/TestsExample/android/build.gradle index 88a3ddd91d..0928bcde30 100644 --- a/TestsExample/android/build.gradle +++ b/TestsExample/android/build.gradle @@ -9,7 +9,7 @@ buildscript { // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" - kotlinVersion = "1.6.21" + kotlinVersion = "1.8.22" } repositories { google() diff --git a/android/build.gradle b/android/build.gradle index 056a698ede..3e2d6f8cf2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,9 +1,11 @@ +import com.android.Version + buildscript { ext { - rnsDefaultTargetSdkVersion = 31 - rnsDefaultCompileSdkVersion = 31 + rnsDefaultTargetSdkVersion = 34 + rnsDefaultCompileSdkVersion = 34 rnsDefaultMinSdkVersion = 21 - rnsDefaultKotlinVersion = '1.6.21' + rnsDefaultKotlinVersion = '1.8.0' } ext.safeExtGet = {prop, fallback -> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback @@ -15,7 +17,7 @@ buildscript { dependencies { classpath('com.android.tools.build:gradle:4.2.2') classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', rnsDefaultKotlinVersion)}" - classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0" + classpath "com.diffplug.spotless:spotless-plugin-gradle:6.11.0" } } @@ -45,7 +47,7 @@ def reactNativeArchitectures() { android { compileSdkVersion safeExtGet('compileSdkVersion', rnsDefaultCompileSdkVersion) - def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION + def agpVersion = Version.ANDROID_GRADLE_PLUGIN_VERSION if (agpVersion.tokenize('.')[0].toInteger() >= 7) { namespace "com.swmansion.rnscreens" } @@ -122,10 +124,10 @@ repositories { dependencies { implementation 'com.facebook.react:react-native:+' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.fragment:fragment:1.2.1' - implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' - implementation 'com.google.android.material:material:1.1.0' - implementation "androidx.core:core-ktx:1.5.0" + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.fragment:fragment-ktx:1.6.1' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + implementation 'com.google.android.material:material:1.9.0' + implementation "androidx.core:core-ktx:1.10.1" } diff --git a/android/spotless.gradle b/android/spotless.gradle index 7c9f86c0aa..b8bed0830d 100644 --- a/android/spotless.gradle +++ b/android/spotless.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.diffplug.spotless' spotless { kotlin { target 'src/**/*.kt' - ktlint("0.40.0") + ktlint("0.43.0") trimTrailingWhitespace() indentWithSpaces() endWithNewline()