cleanup

msx80 · Sep 30, 2024 · 6f2fe98 · 6f2fe98
1 parent 08a8231
commit 6f2fe98
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 279 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,25 +33,28 @@ jobs:
         echo "GITHUB_DDVER=$(mvn -q org.apache.maven.plugins:maven-help-plugin:3.1.1:evaluate -Dexpression=project.version -DforceStdout)" >> $GITHUB_ENV
     - name: Build android
       run: |
-        cd androidWrapper
+        cd android-wrapper
         gradle --stacktrace -Pcartridge.artifactId=retrodrawing -Pcartridge.groupId=com.github.msx80.omicron -Pcartridge.version=$GITHUB_DDVER clean assembleRelease
     - uses: actions/upload-artifact@v4
       with:
         name: Unsigned retrodrawing.apk
-        path: androidWrapper/app/build/outputs/apk/release/app-release-unsigned.apk
+        path: android-wrapper/app/build/outputs/apk/release/app-release-unsigned.apk
     - uses: ilharp/sign-android-release@v1
       name: Sign app APK
       id: sign_app
       with:
-        releaseDir: androidWrapper/app/build/outputs/apk/release
+        releaseDir: android-wrapper/app/build/outputs/apk/release
         signingKey: ${{ secrets.SIGNING_KEY }}
         keyAlias: ${{ secrets.SIGNING_ALIAS }}
         keyStorePassword: ${{ secrets.SIGNING_PASSWORD }}
         buildToolsVersion: 33.0.2
+    - name: Rename apk
+      run: |
+        mv -v ${{steps.sign_app.outputs.signedFile}} retrodrawing.apk
     - uses: actions/upload-artifact@v4
       with:
         name: retrodrawing.apk
-        path: ${{steps.sign_app.outputs.signedFile}}
+        path: retrodrawing.apk
     - name: Build desktop
       run: |
         cd desktop-mvn

diff --git a/androidWrapper/app/build.gradle → android-wrapper/app/build.gradle b/androidWrapper/app/build.gradle → android-wrapper/app/build.gradle
diff --git a/androidWrapper/app/default.png → android-wrapper/app/default.png b/androidWrapper/app/default.png → android-wrapper/app/default.png
diff --git a/androidWrapper/app/proguard-rules.pro → android-wrapper/app/proguard-rules.pro b/androidWrapper/app/proguard-rules.pro → android-wrapper/app/proguard-rules.pro
diff --git a/...dWrapper/app/src/main/AndroidManifest.xml → ...-wrapper/app/src/main/AndroidManifest.xml b/...dWrapper/app/src/main/AndroidManifest.xml → ...-wrapper/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
 		<meta-data android:name="omicronMain" android:value="${omicronMain}" />
         <activity
             android:name="com.github.msx80.omicron.AndroidLauncher"
-            android:exported="false"
+            android:exported="true"
 			android:screenOrientation="${orientation}"
             android:label="${appName}"
 			android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout"

diff --git a/androidWrapper/build.gradle → android-wrapper/build.gradle b/androidWrapper/build.gradle → android-wrapper/build.gradle
diff --git a/androidWrapper/gradle.properties → android-wrapper/gradle.properties b/androidWrapper/gradle.properties → android-wrapper/gradle.properties
diff --git a/androidWrapper/gradle/libs.versions.toml → android-wrapper/gradle/libs.versions.toml b/androidWrapper/gradle/libs.versions.toml → android-wrapper/gradle/libs.versions.toml
diff --git a/androidWrapper/settings.gradle → android-wrapper/settings.gradle b/androidWrapper/settings.gradle → android-wrapper/settings.gradle
diff --git a/androidWrapper/gradlew b/androidWrapper/gradlew
diff --git a/androidWrapper/gradlew.bat b/androidWrapper/gradlew.bat