fix github action

Author: ShreyashKore

.github/workflows/main.yml

@@ -39,47 +39,47 @@ jobs:
         run: |
           echo -n "${{ secrets.ANDROID_KEYSTORE }}" | base64 -d > $RUNNER_TEMP/key.jks
       - name: Build APK
-        run: ./gradlew composeApp:assembleRelease
+        run: ./gradlew androidApp:assembleRelease
       - name: Build Deb
-        run: ./gradlew composeApp:packageDeb
+        run: ./gradlew desktopApp:packageDeb
       - name: Build WASM
-        run: ./gradlew composeApp:wasmJsBrowserDistribution
+        run: ./gradlew webApp:wasmJsBrowserDistribution
       - name: Build JS
-        run: ./gradlew composeApp:jsBrowserDistribution
+        run: ./gradlew webApp:jsBrowserDistribution
       - name: Generate release assets
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         env:
           VERSION: ${{ github.ref_name }}
         run: |
           JS_ZIP="com.shreyashkore.wonderouscompose_$VERSION-JS.zip"
           WASM_ZIP="com.shreyashkore.wonderouscompose_$VERSION-WASM.zip"
-          (cd ./composeApp/build/dist && zip -r $JS_ZIP js)
-          (cd ./composeApp/build/dist && zip -r $WASM_ZIP wasmJs)
+          (cd ./webApp/build/dist && zip -r $JS_ZIP js)
+          (cd ./webApp/build/dist && zip -r $WASM_ZIP wasmJs)
       - name: Release
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: softprops/action-gh-release@v2.0.8
         with:
           token: ${{ secrets.TOKEN }}
           files: |
-            ./composeApp/build/outputs/apk/release/composeApp-release.apk
-            ./composeApp/build/compose/binaries/main/deb/*.deb
-            ./composeApp/build/dist/*.zip
+            ./androidApp/build/outputs/apk/release/androidApp-release.apk
+            ./desktopApp/build/compose/binaries/main/deb/*.deb
+            ./webApp/build/dist/*.zip
 
       - name: Deploy Wasm
         if: ${{ github.event_name == 'release' }}
         uses: JamesIves/github-pages-deploy-action@4.1.5
         with:
           token: ${{ secrets.TOKEN }}
           branch: main
-          folder: composeApp/build/dist/wasmJs/productionExecutable
+          folder: webApp/build/dist/wasmJs/productionExecutable
           repository-name: ShreyashKore/wonderous-compose-wasm
       - name: Deploy JS
         if: ${{ github.event_name == 'release' }}
         uses: JamesIves/github-pages-deploy-action@4.1.5
         with:
           token: ${{ secrets.TOKEN }}
           branch: main
-          folder: composeApp/build/dist/js/productionExecutable
+          folder: webApp/build/dist/js/productionExecutable
           repository-name: ShreyashKore/wonderous-compose-js
 
   build_windows:
@@ -103,14 +103,14 @@ jobs:
         run: echo "sdk.dir=some_location" > ./local.properties
       - name: Build MSI
         run: |
-          ./gradlew composeApp:packageMsi
+          ./gradlew desktopApp:packageMsi
       - name: Upload Release Asset
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: softprops/action-gh-release@v2.0.8
         with:
           token: ${{ secrets.TOKEN }}
           files: |
-            ./composeApp/build/compose/binaries/main/msi/*.msi
+            ./desktopApp/build/compose/binaries/main/msi/*.msi
 
   #  build_ios:
   #    runs-on: macos-latest

androidApp/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import java.util.Properties
 
 plugins {
     alias(libs.plugins.androidApplication)
@@ -7,6 +8,13 @@ plugins {
     alias(libs.plugins.androidMapsSecrets)
 }
 
+val keystorePropertiesFile = rootProject.file("key.properties")
+val keystoreProperties = Properties().apply {
+    if (keystorePropertiesFile.exists()) {
+        load(keystorePropertiesFile.inputStream())
+    }
+}
+
 kotlin {
     compilerOptions {
         jvmTarget = JvmTarget.JVM_11
@@ -38,9 +46,22 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    signingConfigs {
+        if (keystorePropertiesFile.exists()) {
+            create("release") {
+                storeFile = file(keystoreProperties.getProperty("path"))
+                storePassword = keystoreProperties.getProperty("storePassword")
+                keyAlias = keystoreProperties.getProperty("alias")
+                keyPassword = keystoreProperties.getProperty("keyPassword")
+            }
+        }
+    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
+            if (keystorePropertiesFile.exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
         }
     }
     compileOptions {

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 ## Project Version
-versionCode = "105"
-versionName = "1.0.5"
+versionCode = "110"
+versionName = "1.1.0"
 
 ## Frameworks and Libraries
 agp = "9.0.1"