Add macos, ios, jvm, wasm targets (#57)

* Add multiplatform targets * Add targets to material3 * Run publish on macos
boswelja · Apr 5, 2024 · 7e796b0 · 7e796b0
1 parent 059ed85
commit 7e796b0
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 10 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   publish-github:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     permissions:
       contents: read
       packages: write
@@ -31,7 +31,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
 
   publish-oss:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     permissions:
       contents: read
       packages: write
@@ -57,7 +57,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
 
   upload-pages:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     needs:
       - publish-github
       - publish-oss

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,3 +6,7 @@ plugins {
 
     alias(libs.plugins.dokka)
 }
+
+repositories {
+    mavenCentral()
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -44,14 +45,38 @@ android {
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 kotlin {
+    applyDefaultHierarchyTemplate()
+
     jvmToolchain(17)
+
     explicitApi()
 
+    // Android
     androidTarget {
         publishLibraryVariants("release")
     }
 
+    // Apple
+    macosX64()
+    macosArm64()
+    iosX64()
+    iosArm64()
+
+    // JVM
+    jvm()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     sourceSets {
         commonMain {
             dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -9,3 +9,6 @@ kotlin.code.style=official
 # Below here is all packaging details, not build configuration.
 version=1.2.2
 group=io.github.boswelja.menuprovider
+
+org.jetbrains.compose.experimental.macos.enabled=true
+org.jetbrains.compose.experimental.wasm.enabled=true
diff --git a/material3/build.gradle.kts b/material3/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.net.URL
 
 plugins {
@@ -44,14 +45,38 @@ android {
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 kotlin {
+    applyDefaultHierarchyTemplate()
+
     jvmToolchain(17)
+
     explicitApi()
 
+    // Android
     androidTarget {
         publishLibraryVariants("release")
     }
 
+    // Apple
+    macosX64()
+    macosArm64()
+    iosX64()
+    iosArm64()
+
+    // JVM
+    jvm()
+
+    // WASM
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+    }
+
     sourceSets {
         commonMain {
             dependencies {

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