From 943203ab3be5f8e0ccdc1064952c83b73bc3d33a Mon Sep 17 00:00:00 2001 From: ringga Date: Mon, 5 Oct 2026 10:56:04 +0700 Subject: [PATCH 1/2] chore: remove Android SDK setup action from CI and publish workflows Feature Summary: - CI and Publish Workflows: - Remove the Android SDK setup action step across all job configurations in continuous integration and release pipelines. File-level Changes: - .github/workflows/ci.yml: Remove the android-actions/setup-android step from the build and test jobs (CI Pipeline Execution). - .github/workflows/publish.yml: Remove the android-actions/setup-android step from the release and publishing jobs (Release Artifact Publishing). --- .github/workflows/ci.yml | 4 ---- .github/workflows/publish.yml | 6 ------ 2 files changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b66aad0..c8593f5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,6 @@ jobs: distribution: temurin java-version: ${{ env.JAVA_VERSION }} - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -64,8 +62,6 @@ jobs: distribution: temurin java-version: ${{ env.JAVA_VERSION }} - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e4fe9a4..7965e4af 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,8 +37,6 @@ jobs: distribution: temurin cache: gradle - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -107,8 +105,6 @@ jobs: distribution: temurin cache: gradle - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 @@ -214,8 +210,6 @@ jobs: distribution: temurin cache: gradle - - name: Set up Android SDK - uses: android-actions/setup-android@v3 - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 From 71100ed56000557a3fe7a827da075c3f15bd366c Mon Sep 17 00:00:00 2001 From: ringga Date: Mon, 5 Oct 2026 11:08:26 +0700 Subject: [PATCH 2/2] refactor: update JVM target configuration to JVM 17 and clean up unused navigation imports Feature Summary: - Build and Target Configuration: - Update JVM target to JVM 17 for both the desktop app and shared modules to ensure modern runtime compatibility. - Navigation Cleanup: - Remove unused Compose layout, material, and platform configuration imports from the application navigation component. File-level Changes: - AppNavigation.kt: Remove unused imports for fillMaxSize, MaterialTheme, Modifier, and LocalConfiguration (Navigation Setup). - desktopApp/build.gradle.kts: Configure JVM target to JVM_17 inside the kotlin jvm target block (Desktop Build Configuration). - shared/build.gradle.kts: Configure JVM target to JVM_17 inside the kotlin jvm target block (Shared Build Configuration). --- desktopApp/build.gradle.kts | 8 ++++++-- shared/build.gradle.kts | 8 ++++++-- .../ngga/ring/printer_esc_pos/navigation/AppNavigation.kt | 4 ---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts index 9e2e932a..9c3aa359 100644 --- a/desktopApp/build.gradle.kts +++ b/desktopApp/build.gradle.kts @@ -9,8 +9,12 @@ plugins { } kotlin { - jvm() - + jvm { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } + } + sourceSets { jvmMain.dependencies { implementation(project(":shared")) diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index e8e7aa38..5d038a88 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -26,8 +26,12 @@ kotlin { } } - jvm() - + jvm { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } + } + @OptIn(ExperimentalWasmDsl::class) wasmJs { browser() diff --git a/shared/src/commonMain/kotlin/ngga/ring/printer_esc_pos/navigation/AppNavigation.kt b/shared/src/commonMain/kotlin/ngga/ring/printer_esc_pos/navigation/AppNavigation.kt index 7c74eae2..fecadeb4 100644 --- a/shared/src/commonMain/kotlin/ngga/ring/printer_esc_pos/navigation/AppNavigation.kt +++ b/shared/src/commonMain/kotlin/ngga/ring/printer_esc_pos/navigation/AppNavigation.kt @@ -1,10 +1,6 @@ package ngga.ring.printer_esc_pos.navigation -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalConfiguration import ngga.ring.printer_esc_pos.ui.screens.SetupPrinterScreen import ngga.ring.printer_esc_pos.viewmodel.PrinterViewModel