Technical: Kotlin 1.9.21 & Target Android 34. (#1044)

vanniktech · Dec 10, 2023 · 3214587 · 3214587
1 parent 553a378
commit 3214587
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ kotlin {
 android {
   namespace = "com.vanniktech.emoji.sample"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11
@@ -54,7 +54,6 @@ android {
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
       shrinkResources true
-      zipAlignEnabled true
 
       if (shouldSign) {
         signingConfig signingConfigs.release

diff --git a/emoji-facebook/build.gradle b/emoji-facebook/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -64,7 +64,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.facebook"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji-google-compat/build.gradle b/emoji-google-compat/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -65,7 +65,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.googlecompat"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji-google/build.gradle b/emoji-google/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -64,7 +64,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.google"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji-ios/build.gradle b/emoji-ios/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -64,7 +64,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.ios"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji-material/build.gradle b/emoji-material/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -65,7 +65,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.material"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji-twitter/build.gradle b/emoji-twitter/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -64,7 +64,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji.twitter"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/emoji/build.gradle b/emoji/build.gradle
@@ -21,7 +21,7 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
-  android("android") {
+  androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
@@ -71,7 +71,7 @@ kotlin {
 android {
   namespace "com.vanniktech.emoji"
 
-  compileSdkVersion libs.versions.compileSdk.get() as int
+  compileSdk(libs.versions.compileSdk.get() as int)
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_11

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 minSdk = "21"
-compileSdk = "33"
-targetSdk = "33"
+compileSdk = "34"
+targetSdk = "34"
 
 androidgradleplugin = "8.1.1"
-kotlin = "1.8.22"
+kotlin = "1.9.21"
 ktlint = "1.0.1"
 
 [libraries]