Merge pull request #13 from respawn-app/1.3.1

1.3.1
respawn-app · Dec 26, 2023 · 4d96254 · 4d96254
2 parents c9c1045 + 1dd3de3
commit 4d96254
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 945 deletions.
diff --git a/.idea/runConfigurations/kmmutils__publishAllPublicationsToSonatypeRepository_.xml b/.idea/runConfigurations/kmmutils__publishAllPublicationsToSonatypeRepository_.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,18 +24,15 @@ buildscript {
     }
 }
 
-
 allprojects {
     group = Config.artifactId
     version = Config.versionName
     tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
             jvmTarget.set(Config.jvmTarget)
             languageVersion.set(Config.kotlinVersion)
-            freeCompilerArgs.apply {
-                addAll(Config.jvmCompilerArgs)
-            }
-            optIn.addAll(Config.optIns.map { "-opt-in=$it" })
+            freeCompilerArgs.addAll(Config.jvmCompilerArgs)
+            optIn.addAll(Config.optIns)
         }
     }
 }

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -18,7 +18,7 @@ object Config {
 
     const val majorRelease = 1
     const val minorRelease = 3
-    const val patch = 0
+    const val patch = 1
     const val postfix = ""
     const val versionName = "$majorRelease.$minorRelease.$patch$postfix"
 

diff --git a/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt b/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt
@@ -1,4 +1,4 @@
-@file:Suppress("MissingPackageDeclaration", "unused", "UNUSED_VARIABLE", "UndocumentedPublicFunction", "LongMethod")
+@file:Suppress("MissingPackageDeclaration", "unused", "UndocumentedPublicFunction", "LongMethod")
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getValue
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 fun Project.configureMultiplatform(
     ext: KotlinMultiplatformExtension,
     jvm: Boolean = true,
-    android: Boolean = true,
+    android: Boolean = false,
     linux: Boolean = true,
     iOs: Boolean = true,
     js: Boolean = true,
@@ -41,33 +41,33 @@ fun Project.configureMultiplatform(
 
     if (jvm) jvm()
 
-        sequence {
-            if (iOs) {
-                yield(iosX64())
-                yield(iosArm64())
-                yield(iosSimulatorArm64())
-            }
-            if (macOs) {
-                yield(macosArm64())
-                yield(macosX64())
-            }
-            if (tvOs) {
-                yield(tvosX64())
-                yield(tvosArm64())
-                yield(tvosSimulatorArm64())
-            }
-            if (watchOs) {
-                yield(watchosX64())
-                yield(watchosArm64())
-                yield(watchosDeviceArm64())
-                yield(watchosSimulatorArm64())
-            }
-        }.forEach {
-            it.binaries.framework {
-                binaryOption("bundleId", Config.artifactId)
-                binaryOption("bundleVersion", Config.versionName)
-                baseName = Config.artifactId
-            }
+    sequence {
+        if (iOs) {
+            yield(iosX64())
+            yield(iosArm64())
+            yield(iosSimulatorArm64())
+        }
+        if (macOs) {
+            yield(macosArm64())
+            yield(macosX64())
+        }
+        if (tvOs) {
+            yield(tvosX64())
+            yield(tvosArm64())
+            yield(tvosSimulatorArm64())
+        }
+        if (watchOs) {
+            yield(watchosX64())
+            yield(watchosArm64())
+            yield(watchosDeviceArm64())
+            yield(watchosSimulatorArm64())
+        }
+    }.forEach {
+        it.binaries.framework {
+            binaryOption("bundleId", Config.artifactId)
+            binaryOption("bundleVersion", Config.versionName)
+            baseName = Config.artifactId
+        }
     }
 
     sourceSets.apply {

diff --git a/buildSrc/src/main/kotlin/pro.respawn.shared-library.gradle.kts b/buildSrc/src/main/kotlin/pro.respawn.shared-library.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("multiplatform")
-    id("com.android.library")
+    // id("com.android.library")
     id("maven-publish")
     signing
 }
@@ -9,8 +9,8 @@ kotlin {
     configureMultiplatform(this)
 }
 
-android {
-    configureAndroidLibrary(this)
-}
+// android {
+//     configureAndroidLibrary(this)
+// }
 
 publishMultiplatform()
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,6 +1,3 @@
 plugins {
     id("pro.respawn.shared-library")
 }
-android {
-    namespace = "${Config.namespace}.common"
-}
diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts
@@ -2,9 +2,6 @@ plugins {
     id("pro.respawn.shared-library")
     id(libs.plugins.atomicfu.id)
 }
-android {
-    namespace = "${Config.namespace}.coroutines"
-}
 dependencies {
     commonMainApi(libs.kotlinx.coroutines.core)
     commonMainImplementation(libs.kotlinx.atomicfu)

diff --git a/datetime/build.gradle.kts b/datetime/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     id("pro.respawn.shared-library")
 }
 
-android {
-    namespace = "${Config.namespace}.datetime"
-}
-
 dependencies {
     commonMainApi(libs.kotlinx.datetime)
 }
diff --git a/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt b/datetime/src/jvmMain/kotlin/pro/respawn/kmmutils/datetime/DateTimeExtJvm.kt
@@ -4,6 +4,7 @@ package pro.respawn.kmmutils.datetime
 
 import java.time.DayOfWeek
 import java.time.Instant
+import java.time.LocalTime
 import java.time.Month
 import java.time.Year
 import java.time.ZoneId
@@ -186,9 +187,16 @@ public val ZonedDateTime.lengthOfMonth: Int get() = month.length(Year.isLeap(yea
 /**
  * Sets [this]'s time to [time]. Returns a new [ZonedDateTime]
  */
+@Deprecated("Time class is deprecated")
 public fun ZonedDateTime.withTime(time: Time): ZonedDateTime =
     ZonedDateTime.of(year, monthValue, dayOfMonth, time.hour, time.minute, time.second, nano, zone)
 
+/**
+ * Sets [this]'s time to [time]. Returns a new [ZonedDateTime]
+ */
+public fun ZonedDateTime.withTime(time: LocalTime): ZonedDateTime =
+    ZonedDateTime.of(year, monthValue, dayOfMonth, time.hour, time.minute, time.second, nano, zone)
+
 /**
  * Sorts [DayOfWeek]s according to the [locale]. I.e. will affect the first value (Monday / Sunday etc.)
  */

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,19 +2,19 @@
 composeDetektPlugin = "1.3.0"
 coroutines = "1.7.3"
 datetime = "0.5.0"
-dependencyAnalysisPlugin = "1.27.0"
+dependencyAnalysisPlugin = "1.28.0"
 detekt = "1.23.4"
 detektFormattingPlugin = "1.23.4"
 dokka = "1.9.10"
-gradleAndroid = "8.3.0-alpha17"
+gradleAndroid = "8.3.0-alpha18"
 gradleDoctorPlugin = "0.9.1"
 junit = "4.13.2"
 kotest = "5.8.0"
 kotest-plugin = "5.8.0"
-kotlin = "1.9.21"
+kotlin = "1.9.22"
 kotlinx-atomicfu = "0.23.1"
 turbine = "1.0.0"
-versionCatalogUpdatePlugin = "0.8.1"
+versionCatalogUpdatePlugin = "0.8.2"
 versionsPlugin = "0.50.0"
 
 [libraries]

diff --git a/inputforms/build.gradle.kts b/inputforms/build.gradle.kts
@@ -1,9 +1,6 @@
 plugins {
     id("pro.respawn.shared-library")
 }
-android {
-    namespace = "${Config.namespace}.inputforms"
-}
 dependencies {
     commonMainApi(projects.common)
     jvmTestImplementation(libs.bundles.unittest)