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 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