Merge branch 'main' into fix/sprite-frame-timing

Author: jobe-m

.github/workflows/checks.yml

@@ -14,7 +14,6 @@ on:
       - '**'
       - '!**.gitignore'
       - '!**.md'
-      - '!**.github/workflows/*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -209,7 +208,7 @@ jobs:
             publishToMavenLocal \
             :korge-gradle-plugin:publishToMavenLocal
       - name: Run e2e SwiftUI integration
-        run: "./gradlew -p e2e/e2e-test-integration/swiftui/korge-hello-world build"
+        run: "./gradlew -p e2e/e2e-test-integration/swiftui/korge-hello-world check"
       - name: Build Korge iOS simulator framework
         run: "./gradlew -p e2e/e2e-test-integration/swiftui/korge-hello-world linkDebugFrameworkIosSimulatorArm64"
       - name: Build SwiftUI Xcode integration project
@@ -222,6 +221,9 @@ jobs:
             -destination 'generic/platform=iOS Simulator' \
             -derivedDataPath build/xcode-derived-data/SwiftUIKorgeIntegration \
             -resultBundlePath build/xcode-results/SwiftUIKorgeIntegration.xcresult \
+            ARCHS=arm64 \
+            EXCLUDED_ARCHS=x86_64 \
+            ONLY_ACTIVE_ARCH=YES \
             CODE_SIGNING_ALLOWED=NO \
             clean build
       - name: Archive E2E SwiftUI Test Results

.gitignore

@@ -20,7 +20,5 @@ err.txt
 *.hprof
 *.xcuserstate
 xcuserdata
-kotlin-js-store/
-.kotlin
 /stagedRepositoryId
 /**/build

build.gradle.kts

@@ -13,8 +13,6 @@ plugins {
 allprojects {
     repositories {
         mavenLocal()
-        mavenCentral()
-        google()
         maven {
             name = "Central Portal Snapshots"
             url = uri("https://central.sonatype.com/repository/maven-snapshots/")
@@ -23,5 +21,7 @@ allprojects {
                 includeGroup("org.korge.korlibs")
             }
         }
+        mavenCentral()
+        google()
     }
 }

e2e/e2e-test-integration/swiftui/korge-hello-world/build.gradle.kts

@@ -10,9 +10,8 @@ kotlin {
     val iosTargets = listOf(
         iosX64(),
         iosArm64(),
-        iosSimulatorArm64(),
+        iosSimulatorArm64()
     )
-
     // Optionally add more targets
 
     val xcf = XCFramework("ios")
@@ -21,6 +20,8 @@ kotlin {
             baseName = "GameMain"
             xcf.add(this)
             export(libs.korlibs.image)
+            isStatic = true
+            linkerOpts("-lc++")
         }
     }
 
@@ -30,6 +31,64 @@ kotlin {
             implementation(libs.kotlinx.serialization.json)
             implementation(libs.korlibs.image)
         }
+
+        iosMain.dependencies {
+            implementation(libs.korge.engine)
+            api(libs.korlibs.image)
+        }
+
+        iosX64Main.dependencies {
+            implementation(libs.korlibs.image)
+        }
+
+        iosArm64Main.dependencies {
+            implementation(libs.korlibs.image)
+        }
+
+        iosSimulatorArm64Main.dependencies {
+            implementation(libs.korlibs.image)
+        }
+
+        commonTest.dependencies {
+            implementation(kotlin("test"))
+            implementation(libs.korge.engine)
+        }
+
+        /*
+                val commonMain by getting {
+                    dependencies {
+                        implementation(libs.korge.engine)
+                        implementation(libs.kotlinx.serialization.json)
+                        implementation(libs.korlibs.image)
+                    }
+                }
+
+                val iosMain by creating {
+                    dependsOn(commonMain)
+                    dependencies {
+                        api(libs.korlibs.image)
+                    }
+                }
+
+                val iosX64Main by getting {
+                    dependsOn(iosMain)
+                }
+
+                val iosArm64Main by getting {
+                    dependsOn(iosMain)
+                }
+
+                val iosSimulatorArm64Main by getting {
+                    dependsOn(iosMain)
+                }
+
+                val commonTest by getting {
+                    dependencies {
+                        implementation(kotlin("test"))
+                        implementation(libs.korge.engine)
+                    }
+                }
+        */
     }
 }
 
@@ -45,7 +104,7 @@ korge {
 
 // To selectively enable targets
 
-	targetJvm()
-	targetJs()
-	targetAndroid()
+//	targetJvm()
+//	targetJs()
+//	targetAndroid()
 }

e2e/e2e-test-integration/swiftui/korge-hello-world/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx4g
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.applyDefaultHierarchyTemplate=true