Merge pull request #1 from Over-Run/rewrite

Rewrite

.fleet/receipt.json

@@ -0,0 +1,14 @@
+// Project generated by Kotlin Multiplatform Wizard
+{
+    "spec": {
+        "template_id": "kmt",
+        "targets": {
+            "web": {
+                "ui": [
+                    "compose"
+                ]
+            }
+        }
+    },
+    "timestamp": "2024-02-16T06:46:50.981192499Z"
+}

.github/workflows/deploy.yml

@@ -5,21 +5,21 @@ jobs:
     name: Test and Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Setup Java 17 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
       - name: Grant execute permission for gradlew
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x gradlew
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+      - name: Execute Gradle build
+        run: ./gradlew wasmJsBrowserDistribution
 
       # If main branch update, deploy to gh-pages
       - name: Deploy
@@ -28,5 +28,5 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages # The branch the action should deploy to.
-          folder: build/dist/js/productionExecutable # The folder the action should deploy.
+          folder: composeApp/build/dist/wasmJs/productionExecutable # The folder the action should deploy.
           clean: true # Automatically remove deleted files from the deploy branch

.gitignore

@@ -42,3 +42,16 @@ bin/
 .DS_Store
 
 .idea/
+**/build/
+xcuserdata
+!src/**/build/
+local.properties
+captures
+.externalNativeBuild
+.cxx
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+**/xcshareddata/WorkspaceSettings.xcsettings

README.md

@@ -1,5 +1,5 @@
-# OverrunGL Artifacts Customizer
+# OverrunGL Modules Customizer
 
 [![pages-build-deployment](https://github.com/Over-Run/overrungl-gen/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/Over-Run/overrungl-gen/actions/workflows/pages/pages-build-deployment)
 
-The customizer for OverrunGL is available on [GitHub](https://over-run.github.io/overrungl-gen/).
+The customizer for [OverrunGL](https://github.com/Over-Run/overrungl) is available on [GitHub](https://over-run.github.io/overrungl-gen/).

build.gradle.kts

@@ -1,63 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "1.9.0"
-    application
-}
-
-group = "io.github.over-run"
-version = "0.2.2"
-
-repositories {
-    mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
-}
-
-kotlin {
-    jvm {
-        jvmToolchain(17)
-        withJava()
-    }
-    js {
-        binaries.executable()
-        browser {
-            commonWebpackConfig {
-                cssSupport {
-                    enabled.set(true)
-                }
-            }
-        }
-    }
-    sourceSets {
-        val commonMain by getting
-        val commonTest by getting
-        val jvmMain by getting {
-            dependencies {
-                implementation("io.ktor:ktor-server-netty:2.0.2")
-                implementation("io.ktor:ktor-server-html-builder-jvm:2.0.2")
-                implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2")
-            }
-        }
-        val jvmTest by getting
-        val jsMain by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:18.2.0-pre.346")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.2.0-pre.346")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.9.3-pre.346")
-            }
-        }
-        val jsTest by getting
-    }
-}
-
-application {
-    mainClass.set("io.github.overrun.application.ServerKt")
-}
-
-tasks.named<Copy>("jvmProcessResources") {
-    val jsBrowserDistribution = tasks.named("jsBrowserDistribution")
-    from(jsBrowserDistribution)
-}
-
-tasks.named<JavaExec>("run") {
-    dependsOn(tasks.named<Jar>("jvmJar"))
-    classpath(tasks.named<Jar>("jvmJar"))
+    // this is necessary to avoid the plugins to be loaded multiple times
+    // in each subproject's classloader
+    alias(libs.plugins.jetbrainsCompose) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
 }

composeApp/build.gradle.kts

@@ -0,0 +1,40 @@
+import org.jetbrains.compose.ExperimentalComposeLibrary
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+
+    alias(libs.plugins.jetbrainsCompose)
+}
+
+kotlin {
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        moduleName = "composeApp"
+        browser {
+            commonWebpackConfig {
+                outputFileName = "composeApp.js"
+            }
+        }
+        binaries.executable()
+    }
+
+    sourceSets {
+
+        commonMain.dependencies {
+            implementation(compose.runtime)
+            implementation(compose.foundation)
+            implementation(compose.material)
+            implementation(compose.ui)
+            @OptIn(ExperimentalComposeLibrary::class)
+            implementation(compose.components.resources)
+        }
+    }
+}
+
+
+
+compose.experimental {
+    web.application {}
+}