Merge pull request #10 from kota-shiokara/develop

version 2.0.0

Author: kota-shiokara

.github/workflows/deploy.yaml

@@ -13,11 +13,11 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew jsBrowserWebpack
+        run: ./gradlew wasmJsBrowserWebpack
       - name: deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

README.md

@@ -2,14 +2,14 @@
 
 ## Running the Project
 ```
-./gradlew jsBrowserRun
+./gradlew wasmJsBrowserRun
 ```
 or
 ```
-./gradlew jsBrowserRun --continuous
+./gradlew wasmJsBrowserRun --continuous
 ```
 
 ## Build the project
 ```
-./gradlew jsBrowserWebpack
+./gradlew wasmJsBrowserWebpack
 ```

build.gradle.kts

@@ -1,56 +1,74 @@
-plugins {
-    kotlin("multiplatform") version "1.6.10"
-    id("org.jetbrains.compose") version "1.1.0"
-}
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 group = "jp.ikanoshiokara"
-version = "1.0.0"
+version = "2.0.0"
 
 repositories {
+    google()
     mavenCentral()
+    mavenLocal()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
-    google()
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
 }
 
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
+}
+
+// なんでこれ使ってエラーなるのかわからない
+//val copyWasmResources = tasks.create("copyWasmResourcesWorkaround", Copy::class.java) {
+//    from(rootProject.file("src/wasmJsMain/resources"))
+//    into("build/processedResources/wasmJs/main")
+//}
+//
+//afterEvaluate {
+//    project.tasks.getByName("wasmJsProcessResources").finalizedBy(copyWasmResources)
+//}
+
+@OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
 kotlin {
-    js(IR) {
-        browser()
+    wasmJs {
+        moduleName = "kota-shiokara.github.io"
+
         browser {
-            webpackTask {
+            commonWebpackConfig {
                 outputFileName = "main.js"
-                cssSupport.enabled = true
-            }
-            runTask {
-                outputFileName = "main.js"
-                cssSupport.enabled = true
+                devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
+                    static = (static ?: mutableListOf()).apply {
+                        add(project.rootDir.path)
+                    }
+                }
             }
         }
         binaries.executable()
     }
 
     sourceSets {
-        val jsMain by getting {
+        val wasmJsMain by getting {
             dependencies {
-                implementation(compose.web.core)
                 implementation(compose.runtime)
+                implementation(compose.foundation)
+                implementation(compose.material)
+                implementation(compose.ui)
 
-                // kotlin react
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.201-kotlin-1.5.0")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.201-kotlin-1.5.0")
-                implementation(npm("react", "17.0.2"))
-                implementation(npm("react-dom", "17.0.2"))
-
-                implementation(npm("react-icons", "4.7.1"))
-                implementation(npm("@fortawesome/react-fontawesome", "latest"))
+                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+                implementation(compose.components.resources)
             }
         }
     }
 }
 
-afterEvaluate {
-    rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
-        versions.webpackDevServer.version = "4.0.0"
-        versions.webpackCli.version = "4.10.0"
-    }
-}
+compose.experimental {
+    web.application {}
+}
+
+compose {
+    val kotlinVersion = rootProject.extra["kotlin.version"] as String
+    val composeCompilerVersion = rootProject.extra["compose.compiler.version"] as String
+
+    kotlinCompilerPlugin.set(composeCompilerVersion)
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=$kotlinVersion")
+}
+

gradle.properties

@@ -1 +1,7 @@
-kotlin.code.style=official
+kotlin.code.style=official
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.gradle.jvmargs=-Xmx3g
+
+kotlin.version=1.9.20
+compose.compiler.version=1.5.3
+compose.wasm.version=1.5.10-dev-wasm03

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,2 +1,19 @@
 rootProject.name = "kota-shiokara.github.io"
 
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+    }
+
+    plugins {
+        val kotlinVersion = extra["kotlin.version"] as String
+        val composeVersion = extra["compose.wasm.version"] as String
+
+        kotlin("multiplatform").version(kotlinVersion)
+        id("org.jetbrains.compose").version(composeVersion)
+    }
+}