fixes

msx80 · Sep 19, 2024 · 4c6b4a5 · 4c6b4a5
1 parent 7b2a453
commit 4c6b4a5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/mainbuild.yml b/.github/workflows/mainbuild.yml
@@ -77,7 +77,7 @@ jobs:
     - name: Build AlienBuster Android app
       run: |
         cd android-mvn
-        mvn --batch-mode -Dcartridge.artifactId=alienbuster -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean install android:apk
+        mvn --batch-mode -Dcartridge.artifactId=alienbuster -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean package
     - name: Deploy AlienBuster Android App
       uses: actions/upload-artifact@v4
       with:
@@ -86,7 +86,7 @@ jobs:
     - name: Build Featuredemo Android app
       run: |
         cd android-mvn
-        mvn --batch-mode -Dcartridge.artifactId=feature-demo -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean install android:apk
+        mvn --batch-mode -Dcartridge.artifactId=feature-demo -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean package
     - name: Deploy feature-demo Android App
       uses: actions/upload-artifact@v4
       with:
@@ -95,7 +95,7 @@ jobs:
     - name: Build snake Android app
       run: |
         cd android-mvn
-        mvn --batch-mode -Dcartridge.artifactId=snake -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean install android:apk
+        mvn --batch-mode -Dcartridge.artifactId=snake -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean package
     - name: Deploy snake Android App
       uses: actions/upload-artifact@v4
       with:
@@ -104,7 +104,7 @@ jobs:
     - name: Build helloworld Android app
       run: |
         cd android-mvn
-        mvn --batch-mode -Dcartridge.artifactId=helloworld -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean install android:apk
+        mvn --batch-mode -Dcartridge.artifactId=helloworld -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=0.0.3 clean package
     - name: Deploy helloworld Android App
       uses: actions/upload-artifact@v4
       with:

diff --git a/android-mvn/pom.xml b/android-mvn/pom.xml
@@ -6,6 +6,7 @@
   <artifactId>android-wrapper</artifactId>
   <version>1.0.0</version>
   <packaging>apk</packaging>
+
   <properties>
 
   <!-- This is the omicron cartridge to be package as an Android app. You can pass the properties as arguments to mvn with -D -->
@@ -265,13 +266,23 @@
 		<!-- main android plugin. select platform and build-tool version (33.0.2 is the last one supported by java 8) -->
         <groupId>com.github.msx80</groupId>
         <artifactId>android-maven-plugin</artifactId>
-		        <!--<executions>
+		        <executions>
           <execution>
-            <phase>install</phase>
+            <phase>package</phase>
             <goals>
               <goal>apk</goal>
-            </goals>-->
-        <configuration>
+			  <goal>zipalign</goal>
+            </goals>
+        </execution>
+        </executions>
+		<configuration>
+		<zipalignSkip>false</zipalignSkip>
+		<zipalign>
+			<skip>false</skip>
+			<verbose>true</verbose>
+			<inputApk>${project.build.directory}/${cartridge.artifactId}.apk</inputApk>
+			<outputApk>${project.build.directory}/${cartridge.artifactId}.apk</outputApk>
+		</zipalign>
 		  <!-- read natives from the folder we have unpacked them earlier -->
 		  <nativeLibrariesDirectory>${project.build.directory}/libgdxnatives/</nativeLibrariesDirectory>
           <sdk>
@@ -286,8 +297,7 @@
 		 <!-- use the dynamically built manifest -->
 		 <androidManifestFile>${project.build.directory}/filtered-manifest/src/main/AndroidManifest.xml.template</androidManifestFile>
         </configuration>
-		 <!--  </execution>
-        </executions> -->
+
       </plugin>
     </plugins>
 	<finalName>${cartridge.artifactId}</finalName>

diff --git a/android-mvn/src/main/AndroidManifest.xml.template b/android-mvn/src/main/AndroidManifest.xml.template
@@ -19,5 +19,5 @@
             android:label="Crash report" >
 		</activity>		
     </application>
-    <uses-sdk android:minSdkVersion="26" />
+    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
 </manifest>
diff --git a/omicron-player/omicron-player/pom.xml b/omicron-player/omicron-player/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.github.msx80</groupId>
       <artifactId>omicron-basics</artifactId>
-      <version>0.0.3-SNAPSHOT</version>
+      <version>0.0.3</version>
       <scope>compile</scope>
     </dependency>    
 	<dependency>