Merge pull request #41 from kaleidot725/develop_v1.8.0

Merge v1.8.0

.github/workflows/pull_request_check.yaml

@@ -10,9 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
+          bundler-cache: true
       - name: run ktlintCheck
         run: |
           ./gradlew --continue ktlintCheck

.gitignore

@@ -24,3 +24,4 @@ gradle-app.setting
 src/setting.json
 src/gradle.properties
 src/gradle.properties
+output

README.md

@@ -4,7 +4,7 @@ ScrcpyHub is a GUI application to mirror android screens.
 ScrcpyHub uses [scrcpy](https://github.com/Genymobile/scrcpy). [scrcpy](https://github.com/Genymobile/scrcpy) is a
 mirroring android command tool.
 
-https://user-images.githubusercontent.com/23740796/179343198-634e852a-602a-4466-8496-55f6dcd78add.mp4
+https://user-images.githubusercontent.com/23740796/209917460-982786d1-9c09-4408-96b1-3bd0896fe47a.mp4
 
 # ✨ Feature
 
@@ -31,7 +31,7 @@ Install adb and scrcpy, ScrcpyHub.
 ## 💻 Windows 10/11
 
 1. Download [here](https://github.com/Genymobile/scrcpy#windows) and install scrcpy somewhere.
-2. Download [here](https://github.com/kaleidot725/scrcpy-hub/releases/tag/v1.7.1) and launch ScrcpyHub.
+2. Download [here](https://scrcpyhub.netlify.app/) and launch ScrcpyHub.
 3. Open ScrcpyHub Preferences.
 4. Input adb and scrcpy location, save settings.
 
@@ -42,18 +42,8 @@ ScrcpyHub doesn't work mirroring start and stop if you install scrcpy through Ch
 ## 💻 Linux(Ubuntu)
 
 1. Download [here](https://github.com/Genymobile/scrcpy#windows) and install scrcpy somewhere.
-2. Download [here](https://github.com/kaleidot725/scrcpy-hub/releases/tag/v1.7.1) and install ScrcpHub.
-
-```
-sudo dpkg -i scrcpyhub_1.7.0-1_amd64.deb
-```
-
+2. Download [here](https://scrcpyhub.netlify.app/) and install ScrcpHub.
 3. Launch ScrcpyHub, open Preferences.
-
-```
-/opt/scrcpyhub/bin/ScrcpyHub
-```
-
 4. Input adb and scrcpy location, save settings.
 
 ## 💻 macOS
@@ -65,7 +55,7 @@ brew install android-platform-tools
 brew install scrcpy
 ```
 
-2. Download [here](https://github.com/kaleidot725/scrcpy-hub/releases/tag/v1.7.1) and launch ScrcpyHub.
+2. Download [here](https://scrcpyhub.netlify.app/) and launch ScrcpyHub.
 3. Open ScrcpyHub Preferences.
 4. Input adb and scrcpy location, save settings.
 

build.gradle.kts

@@ -1,15 +1,12 @@
-import org.jetbrains.compose.compose
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-
-group = "me.kaleidot725"
-version = "1.7.1"
+group = "jp.kaleidot725"
+version = "1.8.0"
 
 plugins {
-    kotlin("jvm") version "1.6.10"
-    kotlin("plugin.serialization") version "1.6.10"
-
-    id("org.jetbrains.compose") version "1.0.1"
-    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+    kotlin("jvm")
+    kotlin("plugin.serialization")
+    id("org.jetbrains.compose")
+    id("org.jlleitschuh.gradle.ktlint")
+    id("dev.hydraulic.conveyor")
 }
 
 repositories {
@@ -21,48 +18,69 @@ repositories {
 
 dependencies {
     implementation(compose.desktop.currentOs)
-    implementation("com.lordcodes.turtle:turtle:0.6.0")
-    implementation("io.insert-koin:koin-core:3.1.5")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
-    implementation("com.malinskiy.adam:adam:0.4.3")
-    implementation("com.github.Dansoftowner:jSystemThemeDetector:3.6")
-
-    testImplementation(kotlin("test-junit5"))
-    testImplementation("io.mockk:mockk:1.12.3")
-    testImplementation("io.kotest:kotest-runner-junit5:5.1.0")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
-    reporters {
-        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
-    }
+    implementation(compose.material)
+    implementation(compose.materialIconsExtended)
+    implementation(libs.kotlin.coroutines)
+    implementation(libs.turtle)
+    implementation(libs.koin)
+    implementation(libs.kotlin.serialization)
+    implementation(libs.adam)
+    implementation(libs.jSystemThemeDetector)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotest)
 }
 
 compose.desktop {
     application {
         mainClass = "ScrcpyHubKt"
         nativeDistributions {
-            packageName = "ScrcpyHub"
             modules("jdk.management")
-
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-
             macOS {
                 bundleID = "jp.kaleidot725.scrcpyhub"
-                iconFile.set(project.file("icon.icns"))
+                signing {
+                    sign.set(false)
+                }
             }
-
             windows {
-                iconFile.set(project.file("icon.ico"))
-            }
 
-            linux {
-                iconFile.set(project.file("icon.ico"))
             }
         }
     }
 }
+
+dependencies {
+    linuxAmd64(compose.desktop.linux_x64)
+    macAmd64(compose.desktop.macos_x64)
+    macAarch64(compose.desktop.macos_arm64)
+    windowsAmd64(compose.desktop.windows_x64)
+}
+
+// region Work around temporary Compose bugs.
+configurations.all {
+    attributes {
+        // https://github.com/JetBrains/compose-jb/issues/1404#issuecomment-1146894731
+        attribute(Attribute.of("ui", String::class.java), "awt")
+    }
+}
+
+// Force override the Kotlin stdlib version used by Compose to 1.7, as otherwise we can end up with a mix of 1.6 and 1.7 on our classpath.
+dependencies {
+    val v = "1.7.20"
+    for (m in setOf("linuxAmd64", "macAmd64", "macAarch64", "windowsAmd64")) {
+        m("org.jetbrains.kotlin:kotlin-stdlib:$v")
+        m("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$v")
+        m("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$v")
+    }
+}
+// endregion
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+    reporters {
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
+    }
+}

conveyor.conf

@@ -0,0 +1,17 @@
+include required("generated.conveyor.conf")
+include required("/stdlib/jvm/enhancements/client/v1.conf")
+include required("/stdlib/jdk/17.0.5+8/amazon.conf")
+
+app {
+  display-name = "ScrcpyHub"
+  site.base-url = "https://scrcpyhub.netlify.app"
+  icons = "icons/icon-*.png"
+  windows.icons = "icons/icon-*.png"
+
+  jvm {
+    modules += jdk.management
+  }
+}
+
+conveyor.compatibility-level = 4
+conveyor.license-key = "znsu-gayi"