diff --git a/.github/workflows/TEST.yml b/.github/workflows/TEST.yml index fa10e9c58..b86d459a5 100644 --- a/.github/workflows/TEST.yml +++ b/.github/workflows/TEST.yml @@ -108,7 +108,7 @@ jobs: run: ./gradlew --no-daemon publishJvmLocal publishMacosX64PublicationToMavenLocal - name: e2e test working-directory: e2e-test - run: "./gradlew runJvmCheckReferences" + run: "./gradlew jvmTest runJvmCheckReferences" test-native-windows: timeout-minutes: 120 @@ -143,4 +143,4 @@ jobs: - name: e2e test shell: cmd working-directory: e2e-test - run: "CALL gradlew.bat --no-daemon runJvmCheckReferences" + run: "CALL gradlew.bat --no-daemon jvmTest runJvmCheckReferences" diff --git a/e2e-sample/gradlew_linux b/e2e-sample/gradlew_linux deleted file mode 100644 index 6b58cf967..000000000 --- a/e2e-sample/gradlew_linux +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -HOME=`echo ~` docker run --rm -it \ - -v "$PWD:/work:delegated" \ - -v "$HOME/.m2:/home/user/.m2:delegated" \ - -v "$HOME/.gradle:/home/user/.gradle-host:cached" \ - -v "gradlew_gradle_linux:/home/user/.gradle:delegated" \ - -v "gradlew_konan_linux:/home/user/.konan:delegated" \ - soywiz/kotlin-native-win:java8 \ - /bin/bash -c "cp -f /home/user/.gradle-host/gradle.properties /home/user/.gradle/gradle.properties 2> /dev/null; ./gradlew --no-daemon $*" diff --git a/e2e-sample/gradlew_win b/e2e-sample/gradlew_win deleted file mode 100644 index 88a2c0cb4..000000000 --- a/e2e-sample/gradlew_win +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -HOME=`echo ~` docker run --rm -it \ - -v "$PWD:/work:delegated" \ - -v "$HOME/.m2:/home/user/.wine/drive_c/users/user/.m2:delegated" \ - -v "$HOME/.gradle:/home/user/.gradle-host:cached" \ - -v "gradlew_gradle_win:/home/user/.wine/drive_c/users/user/.gradle:delegated" \ - -v "gradlew_konan_win:/home/user/.wine/drive_c/users/user/.konan:delegated" \ - soywiz/kotlin-native-win:java8 \ - /bin/bash -c "cp -f /home/user/.gradle-host/gradle.properties /home/user/.wine/drive_c/users/user/.gradle/gradle.properties 2> /dev/null; winecmd gradlew.bat --no-daemon $*" - diff --git a/e2e-sample/gradlew_wine b/e2e-sample/gradlew_wine deleted file mode 100644 index 3e7b0b96b..000000000 --- a/e2e-sample/gradlew_wine +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -WINEDEBUG=-all wine cmd /c gradlew.bat $* diff --git a/e2e-test/build.gradle.kts b/e2e-test/build.gradle.kts index dd5253a25..9ed6a02bf 100644 --- a/e2e-test/build.gradle.kts +++ b/e2e-test/build.gradle.kts @@ -19,6 +19,12 @@ buildscript { apply() +tasks.withType { + kotlinOptions { + jvmTarget = "1.8" + } +} + korge { id = "com.sample.demo" @@ -78,4 +84,3 @@ tasks { } } } - diff --git a/e2e-test/gradle.properties b/e2e-test/gradle.properties index 001f3eb79..77488c0b6 100644 --- a/e2e-test/gradle.properties +++ b/e2e-test/gradle.properties @@ -1,5 +1,8 @@ korgePluginVersion=2.0.0.999 +#korgePluginVersion=2.6.3 org.gradle.jvmargs=-Xmx4g kotlin.mpp.stability.nowarn=true kotlin.js.webpack.major.version=4 +#kotlin.test.infer.jvm.variant=false +#org.gradle.logging.level=quiet diff --git a/e2e-test/gradlew b/e2e-test/gradlew index a209ca121..de6fc77ef 100755 --- a/e2e-test/gradlew +++ b/e2e-test/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/e2e-test/gradlew_linux b/e2e-test/gradlew_linux deleted file mode 100644 index 6b58cf967..000000000 --- a/e2e-test/gradlew_linux +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -HOME=`echo ~` docker run --rm -it \ - -v "$PWD:/work:delegated" \ - -v "$HOME/.m2:/home/user/.m2:delegated" \ - -v "$HOME/.gradle:/home/user/.gradle-host:cached" \ - -v "gradlew_gradle_linux:/home/user/.gradle:delegated" \ - -v "gradlew_konan_linux:/home/user/.konan:delegated" \ - soywiz/kotlin-native-win:java8 \ - /bin/bash -c "cp -f /home/user/.gradle-host/gradle.properties /home/user/.gradle/gradle.properties 2> /dev/null; ./gradlew --no-daemon $*" diff --git a/e2e-test/gradlew_win b/e2e-test/gradlew_win deleted file mode 100644 index 88a2c0cb4..000000000 --- a/e2e-test/gradlew_win +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -HOME=`echo ~` docker run --rm -it \ - -v "$PWD:/work:delegated" \ - -v "$HOME/.m2:/home/user/.wine/drive_c/users/user/.m2:delegated" \ - -v "$HOME/.gradle:/home/user/.gradle-host:cached" \ - -v "gradlew_gradle_win:/home/user/.wine/drive_c/users/user/.gradle:delegated" \ - -v "gradlew_konan_win:/home/user/.wine/drive_c/users/user/.konan:delegated" \ - soywiz/kotlin-native-win:java8 \ - /bin/bash -c "cp -f /home/user/.gradle-host/gradle.properties /home/user/.wine/drive_c/users/user/.gradle/gradle.properties 2> /dev/null; winecmd gradlew.bat --no-daemon $*" - diff --git a/e2e-test/gradlew_wine b/e2e-test/gradlew_wine deleted file mode 100644 index 3e7b0b96b..000000000 --- a/e2e-test/gradlew_wine +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -WINEDEBUG=-all wine cmd /c gradlew.bat $* diff --git a/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/KorgeGradlePlugin.kt b/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/KorgeGradlePlugin.kt index 5486c2d08..5af029bd5 100644 --- a/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/KorgeGradlePlugin.kt +++ b/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/KorgeGradlePlugin.kt @@ -119,8 +119,7 @@ class KorgeGradleApply(val project: Project) { plugins.apply("kotlin-multiplatform") project.korge.addDependency("commonMainImplementation", "org.jetbrains.kotlin:kotlin-stdlib-common") - project.korge.addDependency("commonTestImplementation", "org.jetbrains.kotlin:kotlin-test-annotations-common") - project.korge.addDependency("commonTestImplementation", "org.jetbrains.kotlin:kotlin-test-common") + project.korge.addDependency("commonTestImplementation", "org.jetbrains.kotlin:kotlin-test") //println("com.soywiz.korlibs.korge2:korge:$korgeVersion") //project.dependencies.add("commonMainImplementation", "com.soywiz.korlibs.korge2:korge:$korgeVersion") diff --git a/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/targets/jvm/Jvm.kt b/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/targets/jvm/Jvm.kt index bb79a19b1..6723b2682 100644 --- a/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/targets/jvm/Jvm.kt +++ b/korge-gradle-plugin/src/main/kotlin/com/soywiz/korge/gradle/targets/jvm/Jvm.kt @@ -16,17 +16,19 @@ import proguard.gradle.* fun Project.configureJvm() { if (gkotlin.targets.findByName("jvm") != null) return - val jvmPreset = (gkotlin.presets.getAt("jvm") as KotlinJvmTargetPreset) - val jvmTarget = jvmPreset.createTarget("jvm") + val jvmTarget = gkotlin.jvm() gkotlin.targets.add(jvmTarget) - //jvmTarget.attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm) project.korge.addDependency("jvmMainImplementation", "net.java.dev.jna:jna:$jnaVersion") project.korge.addDependency("jvmMainImplementation", "net.java.dev.jna:jna-platform:$jnaVersion") project.korge.addDependency("jvmMainImplementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk8") - project.korge.addDependency("jvmTestImplementation", "org.jetbrains.kotlin:kotlin-test") - project.korge.addDependency("jvmTestImplementation", "org.jetbrains.kotlin:kotlin-test-junit") + gkotlin.jvm { + testRuns["test"].executionTask.configure { + it.useJUnit() + //it.useJUnitPlatform() + } + } project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).all { it.kotlinOptions { this.jvmTarget = korge.jvmTarget @@ -119,6 +121,15 @@ private fun Project.configureJvmTest() { val jvmTest = (tasks.findByName("jvmTest") as Test) jvmTest.classpath += project.files().from(project.getCompilationKorgeProcessedResourcesFolder(mainJvmCompilation)) jvmTest.jvmArgs = (jvmTest.jvmArgs ?: listOf()) + listOf("-Djava.awt.headless=true") + + val jvmTestFix = tasks.create("jvmTestFix", Test::class.java) { + it.group = "verification" + it.environment("UPDATE_TEST_REF", "true") + it.testClassesDirs = jvmTest.testClassesDirs + it.classpath = jvmTest.classpath + it.bootstrapClasspath = jvmTest.bootstrapClasspath + it.systemProperty("java.awt.headless", "true") + } } open class PatchedProGuardTask : ProGuardTask() {