Skip to content

Dev #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ringga-dev merged 2 commits into from
Oct 5, 2026
Merged

Dev #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943203a
chore: remove Android SDK setup action from CI and publish workflows
ringga-bf Oct 5, 2026
71100ed
refactor: update JVM target configuration to JVM 17 and clean up unus…
ringga-bf Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions desktopApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ plugins {
}

kotlin {
jvm()

jvm {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

sourceSets {
jvmMain.dependencies {
implementation(project(":shared"))
Expand Down
8 changes: 6 additions & 2 deletions shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ kotlin {
}
}

jvm()

jvm {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
browser()
Expand Down
4 changes: 0 additions & 4 deletions shared/src/commonMain/kotlin/ngga/ring/printer_esc_pos/navigation/AppNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading