From 321458702174e0215518d61541ac10fca8e0d04e Mon Sep 17 00:00:00 2001 From: Niklas Baudy Date: Sun, 10 Dec 2023 12:20:45 -0300 Subject: [PATCH] Technical: Kotlin 1.9.21 & Target Android 34. (#1044) --- app/build.gradle | 3 +-- emoji-facebook/build.gradle | 4 ++-- emoji-google-compat/build.gradle | 4 ++-- emoji-google/build.gradle | 4 ++-- emoji-ios/build.gradle | 4 ++-- emoji-material/build.gradle | 4 ++-- emoji-twitter/build.gradle | 4 ++-- emoji/build.gradle | 4 ++-- gradle/libs.versions.toml | 6 +++--- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 64c7ba4a80..d234f4e869 100644 --- 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 index 283acf924c..fbc0445f42 100644 --- 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 index 7fc91f4c13..1c78aef9f9 100644 --- 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 index 6efe50d9cb..c014362914 100644 --- 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 index 382217fdf2..2a98a0c23a 100644 --- 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 index 8cc49a4c8a..e1efc537e7 100644 --- 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 index 567d17e9ec..72324e6985 100644 --- 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 index 8ddae88506..0fd0bb8454 100644 --- 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 index dd5acc4ba5..892668b298 100644 --- 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]