gradle plugin 7.0.0-beta03 + build cleanup

joreilly · May 30, 2021 · 140eaec · 140eaec
1 parent 25b3a75
commit 140eaec
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 48 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,19 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:7.0.0-beta03")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -18,6 +18,12 @@ object Versions {
     const val junit = "4.12"
 }
 
+object AndroidSdk {
+    const val min = 21
+    const val compile = 30
+    const val target = compile
+}
+
 object Deps {
     const val kermit = "co.touchlab:kermit:${Versions.kermit}"
 }
@@ -43,6 +49,12 @@ object Serialization {
     val core = "org.jetbrains.kotlinx:kotlinx-serialization-core:${Versions.kotlinxSerialization}"
 }
 
+object Kodein {
+    val db = "org.kodein.db:kodein-db:${Versions.kodein_db}"
+    val dbSerializer = "org.kodein.db:kodein-db-serializer-kotlinx:${Versions.kodein_db}"
+
+}
+
 
 object Ktor {
     val clientCore = "io.ktor:ktor-client-core:${Versions.ktor}"

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,36 +1,24 @@
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.serialization")
+    id("kotlinx-serialization")
     id("com.android.library")
     id("org.jetbrains.kotlin.native.cocoapods")
     id("com.chromaticnoise.multiplatform-swiftpackage") version "2.0.3"
 }
 
 android {
-    compileSdkVersion(29)
-    buildToolsVersion("29.0.3")
-
+    compileSdk = AndroidSdk.compile
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdkVersion(21)
-        targetSdkVersion(29)
-        versionCode = 1
-        versionName = "1.0"
+        minSdk = AndroidSdk.min
+        targetSdk = AndroidSdk.target
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        getByName("release") {
-            minifyEnabled(false)
-        }
     }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -40,6 +28,20 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     }
 }
 
+
+// workaround for https://youtrack.jetbrains.com/issue/KT-43944
+android {
+    configurations {
+        create("androidTestApi")
+        create("androidTestDebugApi")
+        create("androidTestReleaseApi")
+        create("testApi")
+        create("testDebugApi")
+        create("testReleaseApi")
+    }
+}
+
+
 // CocoaPods requires the podspec to have a version.
 version = "1.0"
 
@@ -82,8 +84,8 @@ kotlin {
                 implementation(Serialization.core)
 
                 // Kodein-DB
-                api("org.kodein.db:kodein-db:${Versions.kodein_db}")
-                api("org.kodein.db:kodein-db-serializer-kotlinx:${Versions.kodein_db}")
+                api(Kodein.db)
+                api(Kodein.dbSerializer)
 
                 // kermit
                 api(Deps.kermit)

diff --git a/common/src/main/AndroidManifest.xml → common/src/androidMain/AndroidManifest.xml b/common/src/main/AndroidManifest.xml → common/src/androidMain/AndroidManifest.xml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,5 @@ pluginManagement {
 
 rootProject.name = "BikeShare"
 
-enableFeaturePreview("GRADLE_METADATA")
-
 include(":app", ":common", ":compose-desktop")