Configure samples/sensortag/

.github/workflows/ci.yml

@@ -1,10 +1,10 @@
 name: CI
 on:
   pull_request:
-  # Trigger on merges to `main` to allow `gradle/gradle-build-action` runs to write their caches.
-  # https://github.com/gradle/gradle-build-action#using-the-caches-read-only
   push:
     branches:
+      # Trigger on merges to `main` to allow `gradle/actions/setup-gradle` to write its caches.
+      # https://github.com/gradle/actions/blob/main/docs/setup-gradle.md#using-the-cache-read-only
       - main
 
 jobs:
@@ -24,8 +24,8 @@ jobs:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
       - run: ./gradlew :kable-core:compileKotlinJvm
       - run: unzip kable-btleplug-ffi.jar && rm -rf META-INF com *.jar
@@ -50,8 +50,8 @@ jobs:
           merge-multiple: true
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
 
       - run: ./gradlew assemble -PsuppressWarnings=true

.github/workflows/pages.yml

@@ -11,23 +11,38 @@ jobs:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
         with:
           cache-read-only: true
-          validate-wrappers: true
 
       - run: ./gradlew dokkaGenerate
       - run: >
           tar
+          --verbose
           --dereference --hard-dereference
           --directory build/dokkaHtmlMultiModule
-          -cvf '${{ runner.temp }}/artifact.tar'
+          --create --file '${{ runner.temp }}/artifact.tar'
           --exclude=.git
           --exclude=.github
           .
 
+      - run: ./gradlew :shared:wasmJsBrowserDistribution
+        working-directory: samples/sensortag
+
+      - run: >
+          tar
+          --verbose
+          --dereference --hard-dereference
+          --directory shared/build/dist/wasmJs/productionExecutable
+          --transform 's|^|sensortag/|'
+          --append --file '${{ runner.temp }}/artifact.tar'
+          --exclude=.git
+          --exclude=.github
+          .
+        working-directory: samples/sensortag
+
       - uses: actions/upload-artifact@v7
         with:
           name: github-pages

.github/workflows/publish.yml

@@ -21,8 +21,8 @@ jobs:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
       - run: ./gradlew :kable-btleplug-ffi:assemble
       - run: unzip kable-btleplug-ffi.jar && rm -rf META-INF com *.jar
@@ -47,8 +47,8 @@ jobs:
           merge-multiple: true
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
 
       - run: ./gradlew check

samples/sensortag/.github/workflows/android.yml → .github/workflows/sensortag-android.yml

@@ -1,25 +1,23 @@
-name: Android
+name: SensorTag / Android
 on:
   pull_request:
-  # Trigger on merges to `main` to allow `gradle/gradle-build-action` runs to write their caches.
-  # https://github.com/gradle/gradle-build-action#using-the-caches-read-only
-  push:
-    branches:
-      - main
 
 env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
+defaults:
+  run:
+    working-directory: samples/sensortag
+
 jobs:
   build:
-    name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
       - run: ./gradlew :android:assemble
       - run: ./gradlew :android:check

samples/sensortag/.github/workflows/ios.yml → .github/workflows/sensortag-ios.yml

@@ -1,4 +1,4 @@
-name: iOS
+name: SensorTag / iOS
 on:
   pull_request:
 
@@ -7,11 +7,10 @@ env:
 
 defaults:
   run:
-    working-directory: ios
+    working-directory: samples/sensortag
 
 jobs:
   build:
-    name: Build
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v7
@@ -20,11 +19,13 @@ jobs:
           xcode-version: latest-stable
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
+
       - run: brew install xcodegen
       - run: ./gradlew :ios:generateXcodeProject
+
       - run: >
           xcodebuild
           -project SensorTag.xcodeproj
@@ -33,3 +34,4 @@ jobs:
           -destination 'generic/platform=iOS'
           build
           CODE_SIGNING_ALLOWED='NO'
+        working-directory: samples/sensortag/ios

samples/sensortag/.github/workflows/webapp.yml → .github/workflows/sensortag-web.yml

@@ -1,19 +1,22 @@
-name: Webapp
+name: SensorTag / Web
 on:
   pull_request:
 
 env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
+defaults:
+  run:
+    working-directory: samples/sensortag
+
 jobs:
   build:
-    name: Browser Distribution
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
       - run: ./gradlew :shared:wasmJsBrowserDistribution

.github/workflows/signing.yml

@@ -12,9 +12,11 @@ jobs:
       - uses: actions/checkout@v7
       - uses: actions/setup-java@v5
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
       - uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-read-only: true
 
       - name: publishToMavenLocal
         run: >

.gitignore

@@ -1,7 +1,10 @@
+*.xcodeproj/
 .DS_Store
 .gradle
 .idea
 .kotlin/
+.sdkmanrc
 build/
-local.properties
+Info.plist
 kable-btleplug-ffi/target/
+local.properties

README.md

@@ -659,7 +659,7 @@ limitations under the License.
 [Bluetooth permissions]: https://developer.android.com/develop/connectivity/bluetooth/bt-permissions
 [Coroutine scope]: https://kotlinlang.org/docs/reference/coroutines/coroutine-context-and-dispatchers.html#coroutine-scope
 [Coroutines with multithread support for Kotlin/Native]: https://github.com/Kotlin/kotlinx.coroutines/issues/462
-[SensorTag sample app]: https://github.com/JuulLabs/sensortag
+[SensorTag sample app]: samples/sensortag
 [`Advertisement`]: https://juullabs.github.io/kable/kable-core/com.juul.kable/-advertisement/index.html
 [`Characteristic`]: https://juullabs.github.io/kable/kable-core/com.juul.kable/-characteristic/index.html
 [`Connected`]: https://juullabs.github.io/kable/kable-core/com.juul.kable/-state/-connected/index.html

build.gradle.kts

@@ -6,13 +6,13 @@ buildscript {
 }
 
 plugins {
-    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.android.kmp.library) apply false
+    alias(libs.plugins.api)
+    alias(libs.plugins.dokka)
+    alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.kotlinter) apply false
     alias(libs.plugins.maven.publish) apply false
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.api)
 }
 
 dokka {

gradle/libs.versions.toml

@@ -2,39 +2,76 @@
 agp = "9.2.1"
 android-compile = "37"
 android-min = "21"
+android-target = "33"
+compose = "1.11.1"
 coroutines = "1.11.0"
 jna = "5.19.1"
 jvm-toolchain = "17"
 kotlin = "2.4.0"
+krayon = "0.24.0"
 tuulbox = "8.1.0"
+voyager = "2.2.21-1.10.3"
 
 [libraries]
 androidx-core = { module = "androidx.core:core-ktx", version = "1.19.0" }
+androidx-lifecycle = { module = "androidx.lifecycle:lifecycle-common", version = "2.10.0" }
 androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.2.0" }
 atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.33.0" }
+compose-activity = { module = "androidx.activity:activity-compose", version = "1.13.0" }
+compose-ui = { module = "androidx.compose.ui:ui", version = "1.11.2" }
+datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.8.0-0.6.x-compat" }
+desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
 equalsverifier = { module = "nl.jqno.equalsverifier:equalsverifier", version = "4.5" }
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+kable = { module = "com.juul.kable:kable-core" }
+kable-permissions = { module = "com.juul.kable:kable-default-permissions" }
 khronicle = { module = "com.juul.khronicle:khronicle-core", version = "1.1.0" }
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-browser = { module = "org.jetbrains.kotlinx:kotlinx-browser", version = "0.5.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.9.0" }
+krayon-axis = { module = "com.juul.krayon:axis", version.ref = "krayon" }
+krayon-compose = { module = "com.juul.krayon:compose", version.ref = "krayon" }
+krayon-scale = { module = "com.juul.krayon:scale", version.ref = "krayon" }
+krayon-selection = { module = "com.juul.krayon:selection", version.ref = "krayon" }
+krayon-shape = { module = "com.juul.krayon:shape", version.ref = "krayon" }
 mockk = { module = "io.mockk:mockk", version = "1.14.11" }
 robolectric = { module = "org.robolectric:robolectric", version = "4.16.1" }
+serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version = "1.11.0" }
 tomlkt = { module = "net.peanuuutz.tomlkt:tomlkt", version = "0.5.0" }
-tuulbox-collections = { module = "com.juul.tuulbox:collections", version.ref = "tuulbox" }
 tuulbox-coroutines = { module = "com.juul.tuulbox:coroutines", version.ref = "tuulbox" }
+voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
+voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" }
+voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }
 wrappers-bom = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version = "2026.6.5" }
 wrappers-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser" }
 wrappers-web = { module = "org.jetbrains.kotlin-wrappers:kotlin-web" }
 
+[bundles]
+krayon = [
+    "krayon-axis",
+    "krayon-scale",
+    "krayon-selection",
+    "krayon-shape",
+]
+voyager = [
+    "voyager-navigator",
+    "voyager-screenmodel",
+    "voyager-transitions",
+]
+
 [plugins]
-android-kmp-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 api = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version = "2.2.0" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinter = { id = "org.jmailen.kotlinter", version = "5.5.0" }
 maven-publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

kable-btleplug-ffi/build.gradle.kts

@@ -9,7 +9,7 @@ kotlin {
 
     dependencies {
         api(libs.jna)
-        api(libs.kotlinx.coroutines.core)
+        api(libs.kotlinx.coroutines)
     }
 }
 

kable-core/build.gradle.kts

@@ -1,7 +1,5 @@
-@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
-
 plugins {
-    alias(libs.plugins.android.kmp.library)
+    alias(libs.plugins.android.kotlin.multiplatform.library)
     alias(libs.plugins.maven.publish)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kotlinter)
@@ -11,6 +9,7 @@ plugins {
 
 fun isRunningOnMacOs() = System.getProperty("os.name").orEmpty().lowercase().startsWith("mac")
 
+@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 kotlin {
     explicitApi()
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
@@ -67,7 +66,7 @@ kotlin {
         }
 
         commonMain.dependencies {
-            api(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.coroutines)
             api(libs.kotlinx.io)
             implementation(libs.atomicfu)
         }

kable-log-engine-khronicle/build.gradle.kts

@@ -1,5 +1,3 @@
-@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
-
 plugins {
     alias(libs.plugins.maven.publish)
     alias(libs.plugins.dokka)
@@ -9,6 +7,7 @@ plugins {
 
 fun isRunningOnMacOs() = System.getProperty("os.name").orEmpty().lowercase().startsWith("mac")
 
+@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 kotlin {
     explicitApi()
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())