Add iOS and MacOS support

.github/workflows/build.yml

@@ -4,19 +4,40 @@ on:
       - "README.md"
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Java
+
+      - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 21
+          distribution: 'zulu'
+          check-latest: true
+          java-version: 22
+          cache: 'gradle'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest
+
+      - name: Cache konan directory
+        uses: actions/cache@v3
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-konan-${{ hashFiles('*.gradle.kts', 'buildSrc/*') }}
+          restore-keys: |
+            ${{ runner.os }}-konan-
+
       - name: Build using Gradle
         run: ./gradlew assemble
+
       - name: Prepare artifacts
         run: |
           mkdir build/artifacts

.github/workflows/docs.yml

@@ -19,23 +19,46 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Java
+
+      - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 21
+          distribution: 'zulu'
+          check-latest: true
+          java-version: 22
+          cache: 'gradle'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest
+
+      - name: Cache konan directory
+        uses: actions/cache@v3
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-konan-${{ hashFiles('*.gradle.kts', 'buildSrc/*') }}
+          restore-keys: |
+            ${{ runner.os }}-konan-
+
       - name: Build docs
         run: |
           mkdir docs
           ./gradlew :dokkaHtmlMultiModule
+
       - name: Setup Pages
         uses: actions/configure-pages@v4
+
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
           path: './docs'
+
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

.github/workflows/release.yml

@@ -7,25 +7,47 @@ permissions:
   contents: write
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Java
+
+      - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 21
+          distribution: 'zulu'
+          check-latest: true
+          java-version: 22
+          cache: 'gradle'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+
+      - name: Validate gradle wrapper
+        uses: gradle/actions/wrapper-validation@v3
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest
+
+      - name: Cache konan directory
+        uses: actions/cache@v3
+        with:
+          path: ~/.konan
+          key: ${{ runner.os }}-konan-${{ hashFiles('*.gradle.kts', 'buildSrc/*') }}
+          restore-keys: |
+            ${{ runner.os }}-konan-
+
       - name: Write new version
         run: |
           VERSION="${{ github.ref }}"
           VERSION=${VERSION#*v}
           sed -i "s/^VERSION_NAME\=.*$/VERSION_NAME=$VERSION/g" gradle.properties
           echo "VERSION=$VERSION" >> $GITHUB_ENV
+
       - name: Build using Gradle
         run: ./gradlew assemble
+
       - name: Publish to GitHub Packages and Maven Central
         run: ./gradlew publish
         env:
@@ -35,6 +57,7 @@ jobs:
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PWD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_KEY_PWD }}
+
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.gitignore

@@ -18,3 +18,7 @@
 local.properties
 /kotlin-js-store
 /docs
+**/xcshareddata/**
+**/xcuserdata/**
+/.idea/detekt.xml
+/.idea/studiobot.xml

README.md

@@ -5,10 +5,9 @@
 ![Maven Central Version](https://img.shields.io/maven-central/v/dev.tclement.fonticons/core?style=for-the-badge)
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/tclement0922/compose-font-icons/build.yml?style=for-the-badge)
 
-
-Makes possible to use icons from a font in JetBrains Compose Multiplatform. 
-Currently supported targets are Android, Desktop (JVM) and Web (JS and WASM). An additional library is available for
-AndroidX Glance (Android App Widgets / WearOS Tiles).
+Makes possible to use icons from a font in JetBrains Compose Multiplatform.
+Currently supported targets are Android, Desktop (JVM), Web (JS and WASM), MacOS, and iOS.
+An additional library is available for AndroidX Glance (Android App Widgets / WearOS Tiles).
 
 This library supports the [Compose Multiplatform Common resources API](https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-images-resources.html)
 alongside platform-specific resources like resource IDs for Android, classpath resources for JVM...
@@ -36,13 +35,15 @@ dependencies {
             <th rowspan="2">
                 Artifact description
             </th>
-            <th colspan="4">Supported platforms</th>
+            <th colspan="6">Supported platforms</th>
         </tr>
         <tr>
             <th>Android</th>
             <th>Desktop (JVM)</th>
             <th>Kotlin/JS</th>
             <th>Kotlin/WASM</th>
+            <th>iOS</th>
+            <th>MacOS</th>
         </tr>
     </thead>
     <tbody>
@@ -53,14 +54,18 @@ dependencies {
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
+            <td>✔️</td>
+            <td>✔️</td>
         </tr>
         <tr align="center">
             <td align="start">core-glance</td>
             <td>AndroidX Glance support</td>
             <td>✔️</td>
-            <td>❎</td>
-            <td>❎</td>
-            <td>❎</td>
+            <td>❌</td>
+            <td>❌</td>
+            <td>❌</td>
+            <td>❌</td>
+            <td>❌</td>
         </tr>
         <tr align="center">
             <td align="start">font-symbols</td>
@@ -69,34 +74,39 @@ dependencies {
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
+            <td>✔️</td>
+            <td>✔️</td>
         </tr>
         <tr align="center">
             <td align="start">font-symbols-outlined</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
+            <td>✔️</td>
+            <td>✔️</td>
         </tr>
         <tr align="center">
             <td align="start">font-symbols-rounded</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
+            <td>✔️</td>
+            <td>✔️</td>
         </tr>
         <tr align="center">
             <td align="start">font-symbols-sharp</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
             <td>✔️</td>
+            <td>✔️</td>
+            <td>✔️</td>
         </tr>
     </tbody>
 </table>
 
-> [!NOTE]
-> IOS won't be supported unless I get a Mac (or someone else contributes)
-
 # Usage
 
 Set the default icon parameters:
@@ -130,7 +140,7 @@ Read the full doc [here](https://tclement0922.github.io/compose-font-icons).
 # License
 
 ```
-     Copyright 2024 T. Clément (@tclement0922)
+     Copyright 2024 T. Clément (@tclement0922) and contributors
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

build.gradle.kts

@@ -19,7 +19,8 @@ import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.dokka.gradle.AbstractDokkaParentTask
 import org.jetbrains.dokka.gradle.AbstractDokkaTask
-import org.jetbrains.kotlin.konan.properties.loadProperties
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import java.net.URL
 
 plugins {
@@ -40,6 +41,21 @@ buildscript {
     }
 }
 
+subprojects {
+    tasks {
+        withType<KotlinJvmCompile>().configureEach {
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_1_8)
+            }
+        }
+        // Kotlin requires the Java compatibility matches despite have no sources.
+        withType<JavaCompile>().configureEach {
+            sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+            targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        }
+    }
+}
+
 fun Project.configureDokka() {
     tasks.withType(AbstractDokkaTask::class) {
         pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {

core-glance/build.gradle.kts

@@ -42,9 +42,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 dependencies {

core/src/commonMain/kotlin/dev/tclement/fonticons/Logger.kt

@@ -19,6 +19,7 @@ package dev.tclement.fonticons
 /**
  * Internal logger class, each target has its own implementation (Log for Android, System.err/out for desktop, console for JS/WASM)
  */
+// todo: remove logging from production code and use kmp-compatible logging library (e.g. kermit)
 internal expect object Logger {
     fun v(tag: String, message: String)
     fun v(tag: String, message: String, throwable: Throwable)
@@ -30,4 +31,4 @@ internal expect object Logger {
     fun w(tag: String, message: String, throwable: Throwable)
     fun e(tag: String, message: String)
     fun e(tag: String, message: String, throwable: Throwable)
-}
+}

core/src/nativeMain/kotlin/dev/tclement/fonticons/Logger.native.kt

@@ -0,0 +1,20 @@
+package dev.tclement.fonticons
+
+import platform.Foundation.NSLog
+
+/**
+ * Internal logger class, each target has its own implementation (Log for Android, System.err/out for desktop, console for JS/WASM)
+ */
+internal actual object Logger {
+
+    actual fun v(tag: String, message: String) = NSLog("$tag: $message")
+    actual fun v(tag: String, message: String, throwable: Throwable) = NSLog("$tag: $message\n$throwable")
+    actual fun d(tag: String, message: String) = NSLog("$tag: $message")
+    actual fun d(tag: String, message: String, throwable: Throwable) = NSLog("$tag: $message\n$throwable")
+    actual fun i(tag: String, message: String) = NSLog("$tag: $message")
+    actual fun i(tag: String, message: String, throwable: Throwable) = NSLog("$tag: $message\n$throwable")
+    actual fun w(tag: String, message: String) = NSLog("$tag: $message")
+    actual fun w(tag: String, message: String, throwable: Throwable) = NSLog("$tag: $message\n$throwable")
+    actual fun e(tag: String, message: String) = NSLog("$tag: $message")
+    actual fun e(tag: String, message: String, throwable: Throwable) = NSLog("$tag: $message\n$throwable")
+}

gradle.properties

@@ -7,7 +7,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
-org.gradle.workers.max=1
 
 kotlin.daemon.jvmargs=-Xmx4096m
 # When configured, Gradle will run in incubating parallel mode.
@@ -25,11 +24,11 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 
+org.jetbrains.compose.experimental.macos.enabled=true
 org.jetbrains.compose.experimental.jscanvas.enabled=true
-kotlin.mpp.applyDefaultHierarchyTemplate=false
 
 GROUP=dev.tclement.fonticons
-VERSION_NAME=1.2.3
+VERSION_NAME=1.3.0
 
 POM_CORE_NAME=Compose Font Icon
 POM_CORE_DESCRIPTION=Font icons composables for Compose Multiplatform