Merge branch 'main' of https://github.com/ThomasBernard03/AndroidTools

Author: ThomasBernard03

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Build macOS App
+name: Build
 
 on:
   push:
@@ -7,37 +7,22 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-13
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Set up Xcode
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '15.1'  
-
-    - name: Build the project
-      run: xcodebuild -project AndroidTools/AndroidTools.xcodeproj -scheme AndroidTools -sdk macosx CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
-
-    - name: Archive the project
-      run: xcodebuild -project AndroidTools/AndroidTools.xcodeproj -scheme AndroidTools -sdk macosx -configuration Release archive -archivePath ${{github.workspace}}/build/AndroidTools.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
-
-    - name: Export the archive
-      run: |
-        xcodebuild -exportArchive \
-          -archivePath ${{github.workspace}}/build/AndroidTools.xcarchive \
-          -exportPath ${{github.workspace}}/build \
-          -exportOptionsPlist AndroidTools/ExportOptions.plist \
-          CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
-
-    - name: List files
-      run: ls -l ${{github.workspace}}/build/
-
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: AndroidTools
-        path: |
-          ${{github.workspace}}/build/*.pkg
-          ${{github.workspace}}/build/*.app
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' 
+          java-version: '17'
+
+      - name: Build the app
+        run: ./gradlew packageDmg
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos-build
+          path: /Users/runner/work/AndroidTools/AndroidTools/composeApp/build/compose/binaries/main/dmg

composeApp/build.gradle.kts

@@ -36,7 +36,7 @@ kotlin {
 
             implementation(libs.kotlinx.datetime)
 
-            implementation("io.klogging:klogging-jvm:0.7.2")
+            implementation(libs.klogging)
         }
         // https://gist.github.com/OysterD3?page=3
         // https://betterprogramming.pub/how-to-create-an-auto-updater-for-desktop-application-jetpack-compose-d118db26d65f

gradle/libs.versions.toml

@@ -12,6 +12,8 @@ koin = "3.4.3"
 
 datetime = "0.6.1"
 
+klogging = "0.7.2"
+
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
@@ -29,6 +31,10 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "datetime" }
 
 
+klogging = { module = "io.klogging:klogging-jvm", version.ref = "klogging" }
+
+
+
 [plugins]
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }