Fix sources for multiplatform

boswelja · Apr 6, 2024 · 13cd704 · 13cd704
1 parent 48696f5
commit 13cd704
Show file tree

Hide file tree

Showing 12 changed files with 161 additions and 38 deletions.
diff --git a/bitrate/build.gradle.kts b/bitrate/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -33,21 +34,46 @@ android {
         sarifReport = true
         htmlReport = false
     }
+}
 
-    publishing {
-        singleVariant("release") {
-            withJavadocJar()
-            withSourcesJar()
-        }
-    }
+repositories {
+    google()
+    mavenCentral()
 }
 
 kotlin {
+    jvmToolchain(17)
+
+    // Android
     androidTarget {
         publishLibraryVariants("release")
     }
+
+    // JVM
     jvm()
-    jvmToolchain(17)
+
+    // Apple
+    iosArm64()
+    iosX64()
+    macosX64()
+    macosArm64()
+    tvosX64()
+    tvosArm64()
+    watchosArm32()
+    watchosArm64()
+
+    // Windows
+    mingwX64()
+
+    // Linux
+    linuxArm64()
+    linuxX64()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
 
     sourceSets {
         commonMain {

diff --git a/bitrate/src/commonMain/kotlin/com/boswelja/bitrate/Bitrate.kt b/bitrate/src/commonMain/kotlin/com/boswelja/bitrate/Bitrate.kt
@@ -1,5 +1,6 @@
 package com.boswelja.bitrate
 
+import kotlin.jvm.JvmInline
 import kotlin.math.roundToLong
 
 /**

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,3 +5,7 @@ plugins {
 
     alias(libs.plugins.dokka)
 }
+
+repositories {
+    mavenCentral()
+}
diff --git a/capacity/build.gradle.kts b/capacity/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -33,21 +34,46 @@ android {
         sarifReport = true
         htmlReport = false
     }
+}
 
-    publishing {
-        singleVariant("release") {
-            withJavadocJar()
-            withSourcesJar()
-        }
-    }
+repositories {
+    google()
+    mavenCentral()
 }
 
 kotlin {
+    jvmToolchain(17)
+
+    // Android
     androidTarget {
         publishLibraryVariants("release")
     }
+
+    // JVM
     jvm()
-    jvmToolchain(17)
+
+    // Apple
+    iosArm64()
+    iosX64()
+    macosX64()
+    macosArm64()
+    tvosX64()
+    tvosArm64()
+    watchosArm32()
+    watchosArm64()
+
+    // Windows
+    mingwX64()
+
+    // Linux
+    linuxArm64()
+    linuxX64()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
 
     sourceSets {
         commonMain {

diff --git a/capacity/src/commonMain/kotlin/com/boswelja/capacity/Capacity.kt b/capacity/src/commonMain/kotlin/com/boswelja/capacity/Capacity.kt
@@ -1,5 +1,6 @@
 package com.boswelja.capacity
 
+import kotlin.jvm.JvmInline
 import kotlin.math.roundToLong
 
 /**

diff --git a/percentage/build.gradle.kts b/percentage/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -35,11 +36,45 @@ android {
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 kotlin {
-    androidTarget()
-    jvm()
     jvmToolchain(17)
 
+    // Android
+    androidTarget {
+        publishLibraryVariants("release")
+    }
+
+    // JVM
+    jvm()
+
+    // Apple
+    iosArm64()
+    iosX64()
+    macosX64()
+    macosArm64()
+    tvosX64()
+    tvosArm64()
+    watchosArm32()
+    watchosArm64()
+
+    // Windows
+    mingwX64()
+
+    // Linux
+    linuxArm64()
+    linuxX64()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     sourceSets {
         commonMain {
             dependencies {

diff --git a/percentage/src/commonMain/kotlin/com/boswelja/percentage/Percentage.kt b/percentage/src/commonMain/kotlin/com/boswelja/percentage/Percentage.kt
@@ -1,6 +1,7 @@
 package com.boswelja.percentage
 
 import com.boswelja.percentage.Percentage.Companion.percent
+import kotlin.jvm.JvmInline
 import kotlin.math.roundToInt
 
 /**

diff --git a/percentage/src/commonTest/kotlin/com/boswelja/percentage/PercentageTest.kt b/percentage/src/commonTest/kotlin/com/boswelja/percentage/PercentageTest.kt
@@ -38,7 +38,7 @@ class PercentageTest {
     )
 
     @Test
-    fun `100 percent is mapped correctly`() {
+    fun oneHundredPercentIsMappedCorrectly() {
         testValue(
             1.0f.percent,
             ONE_HUNDRED_PERCENT
@@ -54,7 +54,7 @@ class PercentageTest {
     }
 
     @Test
-    fun `200 percent is mapped correctly`() {
+    fun twoHundredPercentIsMappedCorrectly() {
         testValue(
             2.0f.percent,
             TWO_HUNDRED_PERCENT
@@ -70,7 +70,7 @@ class PercentageTest {
     }
 
     @Test
-    fun `0 percent is mapped correctly`() {
+    fun zeroPercentIsMappedCorrectly() {
         testValue(
             0f.percent,
             ZERO_PERCENT

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,13 +13,6 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
 
 plugins {
     id("com.gradle.enterprise") version("3.16")

diff --git a/temperature/build.gradle.kts b/temperature/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -35,11 +36,45 @@ android {
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 kotlin {
-    androidTarget()
-    jvm()
     jvmToolchain(17)
 
+    // Android
+    androidTarget {
+        publishLibraryVariants("release")
+    }
+
+    // JVM
+    jvm()
+
+    // Apple
+    iosArm64()
+    iosX64()
+    macosX64()
+    macosArm64()
+    tvosX64()
+    tvosArm64()
+    watchosArm32()
+    watchosArm64()
+
+    // Windows
+    mingwX64()
+
+    // Linux
+    linuxArm64()
+    linuxX64()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     sourceSets {
         commonMain {
             dependencies {

diff --git a/temperature/src/commonMain/kotlin/com/boswelja/temperature/Temperature.kt b/temperature/src/commonMain/kotlin/com/boswelja/temperature/Temperature.kt
@@ -2,6 +2,7 @@ package com.boswelja.temperature
 
 import com.ionspin.kotlin.bignum.decimal.BigDecimal
 import com.ionspin.kotlin.bignum.decimal.toBigDecimal
+import kotlin.jvm.JvmInline
 import kotlin.math.roundToLong
 
 /**

diff --git a/temperature/src/commonTest/kotlin/com/boswelja/temperature/TemperatureTest.kt b/temperature/src/commonTest/kotlin/com/boswelja/temperature/TemperatureTest.kt
@@ -67,79 +67,79 @@ class TemperatureTest {
     }
 
     @Test
-    fun `converting kelvin between water freezing points`() {
+    fun convertingKelvinBetweenWaterFreezingPoints() {
         testAgainstTestPoint(
             WATER_FREEZING.kelvin.kelvin,
             WATER_FREEZING
         )
     }
 
     @Test
-    fun `converting celsius between water freezing points`() {
+    fun convertingCelsiusBetweenWaterFreezingPoints() {
         testAgainstTestPoint(
             WATER_FREEZING.celsius.celsius,
             WATER_FREEZING
         )
     }
 
     @Test
-    fun `converting fahrenheit between water freezing points`() {
+    fun convertingFahrenheitBetweenWaterFreezingPoints() {
         testAgainstTestPoint(
             WATER_FREEZING.fahrenheit.fahrenheit,
             WATER_FREEZING
         )
     }
 
     @Test
-    fun `converting rankine between water freezing points`() {
+    fun convertingRankineBetweenWaterFreezingPoints() {
         testAgainstTestPoint(
             WATER_FREEZING.rankine.rankine,
             WATER_FREEZING
         )
     }
 
     @Test
-    fun `converting reaumur between water freezing points`() {
+    fun convertingReaumurBetweenWaterFreezingPoints() {
         testAgainstTestPoint(
             WATER_FREEZING.reaumur.reaumur,
             WATER_FREEZING
         )
     }
 
     @Test
-    fun `converting kelvin between water boiling points`() {
+    fun convertingKelvinBetweenWaterBoilingPoints() {
         testAgainstTestPoint(
             WATER_BOILING.kelvin.kelvin,
             WATER_BOILING
         )
     }
 
     @Test
-    fun `converting celsius between water boiling points`() {
+    fun convertingCelsiusBetweenWaterBoilingPoints() {
         testAgainstTestPoint(
             WATER_BOILING.celsius.celsius,
             WATER_BOILING
         )
     }
 
     @Test
-    fun `converting fahrenheit between water boiling points`() {
+    fun convertingFahrenheitBetweenWaterBoilingPoints() {
         testAgainstTestPoint(
             WATER_BOILING.fahrenheit.fahrenheit,
             WATER_BOILING
         )
     }
 
     @Test
-    fun `converting rankine between water boiling points`() {
+    fun convertingRankineBetweenWaterBoilingPoints() {
         testAgainstTestPoint(
             WATER_BOILING.rankine.rankine,
             WATER_BOILING
         )
     }
 
     @Test
-    fun `converting reaumur between water boiling points`() {
+    fun convertingReaumurBetweenWaterBoilingPoints() {
         testAgainstTestPoint(
             WATER_BOILING.reaumur.reaumur,
             WATER_BOILING