chore: update the target and compile sdks to latest

Chesire · Sep 2, 2023 · 701fe2a · 701fe2a
1 parent 4c4c0a0
commit 701fe2a
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 49 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,12 +9,12 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         applicationId "com.chesire.nekome"
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
         versionCode 23071421 // Date of build formatted as 'yyMMddHH'
         versionName "2.0.5"
         testInstrumentationRunner "com.chesire.nekome.TestRunner"

diff --git a/build.gradle b/build.gradle
@@ -107,6 +107,5 @@ dependencies {
 }
 
 ext {
-    sdk_version = 33
     java_version = JavaVersion.VERSION_11
 }
diff --git a/core/compose/build.gradle b/core/compose/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.core.compose'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         consumerProguardFiles "consumer-rules.pro"
         vectorDrawables {

diff --git a/core/preferences/build.gradle b/core/preferences/build.gradle
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.core.preferences'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/core/resources/build.gradle b/core/resources/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.core.resources'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/features/login/build.gradle b/features/login/build.gradle
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.app.login'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/features/search/build.gradle b/features/search/build.gradle
@@ -9,11 +9,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.app.search'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/features/series/build.gradle b/features/series/build.gradle
@@ -9,11 +9,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.app.series'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/features/settings/build.gradle b/features/settings/build.gradle
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.app.settings'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,6 +17,8 @@ moshi = "1.15.0"
 okhttp3 = "4.11.0"
 retrofit = "2.9.0"
 
+sdk = "34"
+
 [libraries]
 aboutlibraries-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutlibraries" }
 adevinta-barista = { module = "com.adevinta.android:barista", version = "4.3.0" }

diff --git a/libraries/core/build.gradle b/libraries/core/build.gradle
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.core'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/database/build.gradle b/libraries/database/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.database'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/datasource/activity/build.gradle b/libraries/datasource/activity/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.activity'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/libraries/datasource/auth/build.gradle b/libraries/datasource/auth/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.auth'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/datasource/search/build.gradle b/libraries/datasource/search/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.search'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/datasource/series/build.gradle b/libraries/datasource/series/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.series'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/datasource/trending/build.gradle b/libraries/datasource/trending/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.trending'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/datasource/user/build.gradle b/libraries/datasource/user/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.datasource.user'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/activity/build.gradle b/libraries/kitsu/activity/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.activity'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/libraries/kitsu/auth/build.gradle b/libraries/kitsu/auth/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.auth'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/build.gradle b/libraries/kitsu/build.gradle
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/library/build.gradle b/libraries/kitsu/library/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.library'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/search/build.gradle b/libraries/kitsu/search/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.search'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/trending/build.gradle b/libraries/kitsu/trending/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.trending'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/libraries/kitsu/user/build.gradle b/libraries/kitsu/user/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.kitsu.user'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.chesire.nekome.testing'
-    compileSdk sdk_version
+    compileSdk libs.versions.sdk.get().toInteger()
 
     defaultConfig {
         minSdk 21
-        targetSdk sdk_version
+        targetSdk libs.versions.sdk.get().toInteger()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,5 @@ dependencies { @@
     }
     ext {
-        sdk_version = 33
         java_version = JavaVersion.VERSION_11
     }