Fix deployment targets and remove watchosArm32 since it those devices…

… are already discontinued (#1289)
korlibs · Feb 8, 2023 · 14998cc · 14998cc
1 parent 0eacbe9
commit 14998cc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/DEPLOY.yml b/.github/workflows/DEPLOY.yml
@@ -71,7 +71,16 @@ jobs:
         with:
           java-version: 1.8
       - run: ./gradlew checkReleasingMavenCentral
-      - run: ./gradlew publishIosArm64PublicationToMavenRepository publishIosX64PublicationToMavenRepository publishIosSimulatorArm64PublicationToMavenRepository
+      - run: ./gradlew |
+          publishIosArm64PublicationToMavenRepository \
+          publishIosX64PublicationToMavenRepository \
+          publishIosSimulatorArm64PublicationToMavenRepository \
+          publishWatchosX64PublicationToMavenRepository \
+          publishWatchosArm64PublicationToMavenRepository \
+          publishWatchosSimulatorArm64PublicationToMavenRepository \
+          publishTvosX64PublicationToMavenRepository \
+          publishTvosArm64PublicationToMavenRepository \
+          publishTvosSimulatorArm64PublicationToMavenRepository
         env:
           DISABLE_JAVASCRIPT_TEST: true
   publish-jvm-multiplatform:
@@ -101,7 +110,10 @@ jobs:
           java-version: 1.8
       - run: sudo apt-get install xvfb
       - run: xvfb-run --auto-servernum ./gradlew --no-daemon checkReleasingMavenCentral
-      - run: xvfb-run --auto-servernum ./gradlew --no-daemon publishJsPublicationToMavenRepository publishAndroidPublicationToMavenRepository
+      - run: |
+          xvfb-run --auto-servernum ./gradlew --no-daemon \
+          publishJsPublicationToMavenRepository \
+          publishAndroidPublicationToMavenRepository
   publish-linux:
     runs-on: ubuntu-latest
     needs: [create-staging-repo]

diff --git a/.github/workflows/TEST.yml b/.github/workflows/TEST.yml
@@ -162,8 +162,8 @@ jobs:
       - { name: Grant execute permission for gradlew, run: chmod +x gradlew }
       - { name: Start gradle, run: ./gradlew }
       - { name: Check compilation of iOS targets, run: ./gradlew publishIosArm64PublicationToMavenLocal publishIosX64PublicationToMavenLocal }
-      - { name: Check compilation of WatchOS targets, run: ./gradlew publishWatchosArm64PublicationToMavenLocal publishWatchosArm32PublicationToMavenLocal }
-      - { name: Check compilation of TvOS targets, run: ./gradlew publishTvosArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal }
+      - { name: Check compilation of watchOS targets, run: ./gradlew publishWatchosArm64PublicationToMavenLocal publishWatchosX64PublicationToMavenLocal }
+      - { name: Check compilation of tvOS targets, run: ./gradlew publishTvosArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal }
       #- { name: Check compilation of TvOS targets, run: ./gradlew publishTvosArm64PublicationToMavenLocal publishTvosX64PublicationToMavenLocal publishTvosSimulatorArm64PublicationToMavenLocal }
       - { name: Run ios simulator tests, run: ./gradlew iosX64Test }
 

diff --git a/buildSrc/src/main/kotlin/com/soywiz/korge/gradle/targets/Targets.kt b/buildSrc/src/main/kotlin/com/soywiz/korge/gradle/targets/Targets.kt
@@ -58,9 +58,8 @@ val KotlinTarget.isIosArm64: Boolean get() = this.name == "iosArm64"
 val KotlinTarget.isIosX64: Boolean get() = this.name == "iosX64"
 val KotlinTarget.isIosSimulatorArm64: Boolean get() = this.name == "iosSimulatorArm64"
 //val KotlinTarget.isIos: Boolean get() = isIosArm64 || isIosX64 || isIosSimulatorArm64
-val KotlinTarget.isWatchosArm32: Boolean get() = this.name == "watchosArm32"
 val KotlinTarget.isWatchosArm64: Boolean get() = this.name == "watchosArm64"
-//val KotlinTarget.isWatchos: Boolean get() = isWatchosArm32 || isWatchosArm64
+//val KotlinTarget.isWatchos: Boolean get() = isWatchosArm64
 val KotlinTarget.isTvosX64: Boolean get() = this.name == "tvosX64"
 val KotlinTarget.isTvosArm64: Boolean get() = this.name == "tvosArm64"
 //val KotlinTarget.isTvos: Boolean get() = isTvosX64 || isTvosArm64

diff --git a/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Targets.kt b/buildSrc/src/main/kotlin/com/soywiz/korlibs/modules/Targets.kt
@@ -60,7 +60,7 @@ fun org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions.mob
     val out = arrayListOf<KotlinNativeTarget>()
     out.addAll(listOf(iosX64(), iosArm64(), iosSimulatorArm64()))
     if (project.doEnableKotlinMobileWatchos) {
-        out.addAll(listOf(watchosX64(), watchosArm32(), watchosArm64(), watchosSimulatorArm64()))
+        out.addAll(listOf(watchosX64(), watchosArm64(), watchosSimulatorArm64()))
     }
     if (project.doEnableKotlinMobileTvos) {
         out.addAll(listOf(tvosX64(), tvosArm64(), tvosSimulatorArm64()))

diff --git a/korim/src/watchosArm32Main/kotlin/com/soywiz/korim/format/cg/CgFloatExtActual.kt b/korim/src/watchosArm32Main/kotlin/com/soywiz/korim/format/cg/CgFloatExtActual.kt