Merge pull request #116 from LachlanMcKee/move-sdk-versions-to-catalog

Moved compile/target/min sdks into version catalog
bumble-tech · Aug 28, 2022 · 6c38a88 · 6c38a88
2 parents 57d3a33 + 53b8129
commit 6c38a88
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 88 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.bumble.appyx"
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -9,11 +9,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.core"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,9 @@
 # keep sorted please, use Edit -> Sort Lines
 
 [versions]
+androidCompileSdk = "32"
+androidMinSdk = "21"
+androidTargetSdk = "32"
 androidx-lifecycle = "2.4.1"
 androidx-navigation-compose = "2.5.1"
 compose = "1.2.0-rc01"

diff --git a/interop-ribs/build.gradle.kts b/interop-ribs/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.interop.ribs"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/interop-rx2/build.gradle.kts b/interop-rx2/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.interop.rx2"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/navmodel-addons/build.gradle.kts b/navmodel-addons/build.gradle.kts
@@ -9,11 +9,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.navmodel"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/samples/navigation-compose/build.gradle b/samples/navigation-compose/build.gradle
diff --git a/samples/navigation-compose/build.gradle.kts b/samples/navigation-compose/build.gradle.kts
@@ -0,0 +1,57 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-parcelize")
+    id("appyx-lint")
+    id("appyx-detekt")
+}
+
+android {
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
+
+    defaultConfig {
+        applicationId = "com.bumble.appyx.sample.navigtion.compose"
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.compose.get()
+    }
+}
+
+dependencies {
+    implementation(project(":core"))
+    implementation(libs.androidx.navigation.compose)
+
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.compose.material)
+    implementation(libs.compose.ui.ui)
+
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.compose.ui.test.junit4)
+}
diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts
@@ -7,12 +7,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.bumble.appyx"
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
 

diff --git a/testing-junit4/build.gradle.kts b/testing-junit4/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.testing.junit4"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/testing-junit5/build.gradle.kts b/testing-junit5/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.testing.junit5"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/testing-ui/build.gradle.kts b/testing-ui/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.testing.ui"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/testing-unit-common/build.gradle.kts b/testing-unit-common/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.bumble.appyx.testing.unit.common"
-    compileSdk = 32
+    compileSdk = libs.versions.androidCompileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 32
+        minSdk = libs.versions.androidMinSdk.get().toInt()
+        targetSdk = libs.versions.androidTargetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }