Make it possible to to develop on devices thar aren't Macs.

Also change the test runners to use ubuntu-latest and use this feature. Test: Manually tested Signed-off-by: David Zeuthen <zeuthen@google.com>
openwallet-foundation-labs · Jun 19, 2024 · 312e2fc · 312e2fc
1 parent fabc6a2
commit 312e2fc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 32 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   build_and_test:
 
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     steps:
     - name: Harden Runner
@@ -45,7 +45,7 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build -x test
+      run: ./gradlew -PdisableIosSupport=1 build -x test
     - name: Run unit tests
-      run: ./gradlew test
+      run: ./gradlew -PdisableIosSupport=1 test
 
diff --git a/README.md b/README.md
@@ -11,7 +11,8 @@ but the current scope also include other credential formats.
 The project includes libraries written in Kotlin:
 
 - `identity` provides the core building blocks and which can also be used
-   in server-side environments.
+   in server-side environments. This is a [Kotlin Multiplatform(https://kotlinlang.org/docs/multiplatform.html)
+   library with support for JVM and iOS.
 - `identity-mdoc` provides data structures and routines for working with
    mdoc credentials. This library can also be used in server-side-environments
 - `identity-sdjwt` provides data structures and routines for working with
@@ -75,10 +76,13 @@ building blocks
   QR engagement, NFC engagement (both static and negotiated), device retrieval
   (BLE, Wifi Aware, and NFC)
 
-Currently these libraries require a Java runtime environment but the plan is
-to target [Kotlin Multiplatform](https://kotlinlang.org/docs/multiplatform.html)
-for the libraries and [Compose Multiplatform](https://www.jetbrains.com/lp/compose-multiplatform/)
-for applications and samples.
+### Multiplatform support
+
+If not using a Mac for development, the `disableIosSupport` gradle property
+can be set to skip targets for iOS:
+```
+echo "disableIosSupport=1" > ~/.gradle/gradle.properties
+```
 
 ### Customization
 

diff --git a/identity/build.gradle.kts b/identity/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.android.builder.core.apiVersionFromString
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -12,21 +10,23 @@ kotlin {
 
     jvm()
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.compilations {
-            val main by getting {
-                cinterops {
-                    create("SwiftCrypto")
+    if (!project.hasProperty("disableIosSupport")) {
+        listOf(
+            iosX64(),
+            iosArm64(),
+            iosSimulatorArm64()
+        ).forEach {
+            it.compilations {
+                val main by getting {
+                    cinterops {
+                        create("SwiftCrypto")
+                    }
                 }
             }
-        }
-        it.binaries.framework {
-            baseName = "identity"
-            isStatic = true
+            it.binaries.framework {
+                baseName = "identity"
+                isStatic = true
+            }
         }
     }
 
@@ -75,22 +75,31 @@ kotlin {
 }
 
 dependencies {
+    if (project.hasProperty("disableIosSupport")) {
+        add("kspJvm", project(":processor"))
+    }
     add("kspCommonMainMetadata", project(":processor"))
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
-    if (name != "kspCommonMainKotlinMetadata") {
-        dependsOn("kspCommonMainKotlinMetadata")
+if (!project.hasProperty("disableIosSupport")) {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
+        if (name != "kspCommonMainKotlinMetadata") {
+            dependsOn("kspCommonMainKotlinMetadata")
+        }
     }
 }
 
-tasks["compileKotlinIosX64"].dependsOn("kspCommonMainKotlinMetadata")
-tasks["compileKotlinIosArm64"].dependsOn("kspCommonMainKotlinMetadata")
-tasks["compileKotlinIosSimulatorArm64"].dependsOn("kspCommonMainKotlinMetadata")
+if (!project.hasProperty("disableIosSupport")) {
+    tasks["compileKotlinIosX64"].dependsOn("kspCommonMainKotlinMetadata")
+    tasks["compileKotlinIosArm64"].dependsOn("kspCommonMainKotlinMetadata")
+    tasks["compileKotlinIosSimulatorArm64"].dependsOn("kspCommonMainKotlinMetadata")
+}
 
 swiftklib {
-    create("SwiftCrypto") {
-        path = file("native/SwiftCrypto")
-        packageName("com.android.identity.swiftcrypto")
+    if (!project.hasProperty("disableIosSupport")) {
+        create("SwiftCrypto") {
+            path = file("native/SwiftCrypto")
+            packageName("com.android.identity.swiftcrypto")
+        }
     }
 }