Version bumps in preparation for 1.0.0

TODO: Kotlin 1.7.20
russhwolf · Oct 3, 2022 · be0af4e · be0af4e
1 parent f529ecc
commit be0af4e
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 297 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-
 plugins {
     id("binary-compatibility-validator") version Versions.binaryCompatibilityValidator
 }
@@ -92,12 +89,6 @@ allprojects {
         tasks.withType<Sign>().configureEach {
             onlyIf { isReleaseBuild }
         }
-
-        tasks.withType(DokkaTask::class.java) {
-            multiplatform {
-                extensions.findByType<KotlinMultiplatformExtension>()?.targets?.forEach { create(it.name) }
-            }
-        }
     }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.20-RC"
 }
 
 repositories {
@@ -26,7 +26,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("gradle-plugin"))
-    implementation("com.android.tools.build:gradle:4.2.2")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
+    implementation("com.android.tools.build:gradle:7.2.2")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
     implementation(kotlin("compiler-embeddable"))
 }
diff --git a/buildSrc/src/main/kotlin/BuildHelpers.kt b/buildSrc/src/main/kotlin/BuildHelpers.kt
@@ -81,6 +81,7 @@ private fun KotlinMultiplatformExtension.buildAllTargets(targetPresets: NamedDom
     targetPresets.forEach {
         if (it is KotlinJvmWithJavaTargetPreset) return@forEach // Probably don't need this, and it chokes on Android plugin
         if (it.isJsTargetPreset && targets.any { it.isJsTarget }) return@forEach // Ignore repeat js targets
+        if (it.name.contains("wasm")) return@forEach // No more Kotlin/Native WASM. TODO re-add new WASM
         if (targets.findByName(it.name) == null) {
             targetFromPreset(it)
         }

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -17,21 +17,21 @@
 @file:Suppress("KDocMissingDocumentation")
 
 object Versions {
-    const val multiplatformSettings = "1.0.0-alpha01"
+    const val multiplatformSettings = "1.0.0-RC"
 
     const val minSdk = 15
-    const val compileSdk = 31
+    const val compileSdk = 33
 
     const val androidxDatastore = "1.0.0"
-    const val androidxPreference = "1.1.1"
-    const val androidxStartup = "1.1.0"
+    const val androidxPreference = "1.2.0"
+    const val androidxStartup = "1.1.1"
     const val androidxTest = "1.4.0"
     const val androidxTestExt = "1.1.3"
-    const val binaryCompatibilityValidator = "0.8.0"
-    const val coroutines = "1.6.1"
+    const val binaryCompatibilityValidator = "0.11.1"
+    const val coroutines = "1.6.4"
     const val junit = "4.13.2"
-    const val robolectric = "4.6.1"
-    const val serializationPlugin = "1.6.21"
-    const val serializationRuntime = "1.3.0"
-    const val turbine = "0.6.1"
+    const val robolectric = "4.8.2"
+    const val serializationPlugin = "1.7.20-RC"
+    const val serializationRuntime = "1.4.0"
+    const val turbine = "0.8.0"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,4 @@
 org.gradle.jvmargs=-Xmx2g
 android.useAndroidX=true
 kotlin.js.compiler=both
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCompatibilityMetadataVariant=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
 #
 
 #Sun Jun 09 17:45:17 EDT 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists