Gradle: Update APG to 7.2.1

And start supportin API level 32.
saschpe · Jun 29, 2022 · 1c75f6b · 1c75f6b
1 parent 8fb863d
commit 1c75f6b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,21 +5,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Android:
+  - Support Android 12 [API level 32](https://developer.android.com/studio/releases/platforms#12)
 - Dependency update:
-  - [Kotlin-1.7.0](https://github.com/JetBrains/kotlin/releases/tag/v1.7.0)
-  - [Ktor-2.0.3](https://ktor.io/changelog/2.0#version-2-0-3)
+  - [Android Gradle Plugin 7.2.1](https://developer.android.com/studio/releases/gradle-plugin#7-2-0) 
+  - [Kotlin 1.7.0](https://github.com/JetBrains/kotlin/releases/tag/v1.7.0)
+  - [Ktor 2.0.3](https://ktor.io/changelog/2.0#version-2-0-3)
 
 ## [1.0.6] - 2022-05-04
 ### Changed
 - Dependency update:
-  - [Ktor-2.0.1](https://ktor.io/changelog/2.0#version-2-0-1)
+  - [Ktor 2.0.1](https://ktor.io/changelog/2.0#version-2-0-1)
 
 ## [1.0.5] - 2022-04-26
 ### Changed
 - Dependency update:
-  - [Gradle-7.4.2](https://docs.gradle.org/7.4.2/release-notes.html)
-  - [Kotlin-1.6.21](https://github.com/JetBrains/kotlin/releases/tag/v1.6.21)
-  - [Ktor-2.0.0](https://ktor.io/changelog/2.0#version-2-0-0)
+  - [Gradle 7.4.2](https://docs.gradle.org/7.4.2/release-notes.html)
+  - [Kotlin 1.6.21](https://github.com/JetBrains/kotlin/releases/tag/v1.6.21)
+  - [Ktor 2.0.0](https://ktor.io/changelog/2.0#version-2-0-0)
 
 ## [1.0.4] - 2022-03-15
 ### Changed
@@ -31,7 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Dependency update:
-  - [Gradle-7.4.1](https://docs.gradle.org/7.4.1/release-notes.html)
+  - [Gradle 7.4.1](https://docs.gradle.org/7.4.1/release-notes.html)
 
 ## [1.0.2] - 2022-03-10
 ### Changed

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") version "1.7.0" apply false
-    id("com.android.library") version "7.0.4" apply false
+    id("com.android.library") version "7.2.1" apply false
     id("com.diffplug.spotless") version "6.7.2"
     id("com.github.ben-manes.versions") version "0.42.0"
 }

diff --git a/kex/build.gradle.kts b/kex/build.gradle.kts
@@ -27,20 +27,25 @@ kotlin {
     sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"])
     sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"])
 
-    sourceSets.remove(sourceSets["androidAndroidTestRelease"]) // https://issuetracker.google.com/issues/152187160
+    sourceSets { // https://issuetracker.google.com/issues/152187160
+        remove(sourceSets["androidAndroidTestRelease"])
+        remove(sourceSets["androidTestFixtures"])
+        remove(sourceSets["androidTestFixturesDebug"])
+        remove(sourceSets["androidTestFixturesRelease"])
+    }
 
     targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests::class.java) {
         testRuns["test"].deviceId = "iPhone 13"
     }
 }
 
 android {
-    buildToolsVersion = "32.0.0"
-    compileSdk = 31
+    buildToolsVersion = "33.0.0"
+    compileSdk = 32
 
     defaultConfig {
         minSdk = 17
-        targetSdk = 31
+        targetSdk = 32
     }
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")