Skip to content

Commit

Permalink
Technical: Kotlin 1.9.21 & Target Android 34.
Browse files Browse the repository at this point in the history
  • Loading branch information
vanniktech committed Dec 10, 2023
1 parent c67c02f commit 2f4e6c1
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 19 deletions.
3 changes: 1 addition & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,7 +54,6 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
shrinkResources true
zipAlignEnabled true

if (shouldSign) {
signingConfig signingConfigs.release
Expand Down
4 changes: 2 additions & 2 deletions emoji-facebook/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji-google-compat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji-google/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji-ios/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji-material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji-twitter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emoji/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metalava {
version = VERSION_NAME

kotlin {
android("android") {
androidTarget("android") {
publishLibraryVariants("release")
}
// ios("ios")
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down

0 comments on commit 2f4e6c1

Please sign in to comment.