Merge pull request #107 from kaleidot725/feature/delete_jbr

Feature/delete jbr

.github/workflows/build_macos_binary.yml

@@ -0,0 +1,27 @@
+name: Build & Ship
+
+on:
+  workflow_dispatch:
+
+jobs:
+  desktop-build:
+    runs-on: macos-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
+      - name: Build exe app
+        run: |
+          .\gradlew packageReleaseExe
+
+      - name: Archive Artifacts Release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows Release
+          if-no-files-found: ignore
+          path: build/compose/binaries/main-release/dmg

.github/workflows/build_windows_binary.yml

@@ -0,0 +1,30 @@
+name: Build & Ship
+
+on:
+  workflow_dispatch:
+
+jobs:
+  desktop-build:
+    runs-on: windows-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+
+      - name: Build exe app
+        run: |
+          .\gradlew packageUberJarForCurrentOS
+          .\gradlew createDistributable
+          .\gradlew packageExe
+          .\gradlew packageReleaseExe
+
+      - name: Archive Artifacts Release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows Release
+          if-no-files-found: ignore
+          path: build/compose/binaries/main-release/exe

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "jp.kaleidot725"
-version = "1.2.0"
+version = "1.3.0"
 
 repositories {
     mavenCentral()
@@ -21,11 +21,6 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain {
-        vendor = JvmVendorSpec.JETBRAINS
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-
     jvm {
     }
     sourceSets {
@@ -39,13 +34,10 @@ kotlin {
                 implementation(libs.kotlinx.coroutines.swing)
                 implementation(libs.kotlin.serialization)
                 implementation(libs.koin)
-//                implementation(libs.jSystemThemeDetectorVer.get())
-                implementation("org.jetbrains.jewel:jewel-int-ui-standalone-241:0.26.2")
-                implementation("org.jetbrains.jewel:jewel-int-ui-decorated-window-241:0.26.2")
                 implementation(compose.desktop.currentOs) { exclude(group = "org.jetbrains.compose.material") }
                 implementation(libs.ktor.core)
                 implementation(libs.ktor.client.okhttp)
-
+                implementation(libs.jSystemThemeDetectorVer)
             }
         }
         val jvmTest by getting {
@@ -62,6 +54,7 @@ compose.desktop {
         buildTypes.release {
             proguard.isEnabled = false
         }
+
         nativeDistributions {
             packageName = "AdbPad"
             modules("jdk.management")
@@ -74,6 +67,10 @@ compose.desktop {
                 org.jetbrains.compose.desktop.application.dsl.TargetFormat.Exe
             )
 
+            jvmArgs(
+                "-Dapple.awt.application.appearance=NSAppearanceNameDarkAqua"
+            )
+
             macOS {
                 bundleID = "jp.kaleidot725.adbpad"
                 iconFile.set(project.file("icon.icns"))

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin="2.0.21"
 kotlin_coroutines="1.9.0"
 kotlin_serialization="1.7.3"
-compose="1.7.0"
+compose="1.7.3"
 ktlint_plugin="12.1.1"
 adam="0.5.8"
 junit="5.11.3"