mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
update to sdk 33, update v2 signer-modded
This commit is contained in:
Anthony Calosa
6
.github/workflows/publish-android.yml
vendored
6
.github/workflows/publish-android.yml
vendored
@@ -43,8 +43,8 @@ jobs:
|
|||||||
uses: maxim-lobanov/setup-android-tools@v1
|
uses: maxim-lobanov/setup-android-tools@v1
|
||||||
with:
|
with:
|
||||||
packages: |
|
packages: |
|
||||||
platforms;android-29
|
platforms;android-33
|
||||||
build-tools;30.0.3
|
build-tools;33.0.2
|
||||||
|
|
||||||
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
|
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
|
||||||
run: |
|
run: |
|
||||||
@@ -83,7 +83,7 @@ jobs:
|
|||||||
- name: Build/Install/Publish to GitHub Packages Apache Maven
|
- name: Build/Install/Publish to GitHub Packages Apache Maven
|
||||||
run: |
|
run: |
|
||||||
export _JAVA_OPTIONS="-Xmx2g"
|
export _JAVA_OPTIONS="-Xmx2g"
|
||||||
mvn -U -B -P android-release-build,android-release-sign,android-release-upload install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }} -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true
|
mvn -U -B -P android-release-build,android-release-upload install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=33.0.2 -Dmaven.test.skip=true
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
|
||||||
|
|||||||
6
.github/workflows/snapshots-android.yml
vendored
6
.github/workflows/snapshots-android.yml
vendored
@@ -46,8 +46,8 @@ jobs:
|
|||||||
- name: Set Up Android tools
|
- name: Set Up Android tools
|
||||||
run: |
|
run: |
|
||||||
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
|
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
|
||||||
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-29"
|
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-33"
|
||||||
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.3"
|
JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;33.0.2"
|
||||||
|
|
||||||
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
|
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
|
||||||
run: |
|
run: |
|
||||||
@@ -89,7 +89,7 @@ jobs:
|
|||||||
d=$(date +%m-%d)
|
d=$(date +%m-%d)
|
||||||
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
# Replace date in forge-gui-mobile/src/forge/Forge.java
|
||||||
sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
|
||||||
mvn -U -B -P android-release-build,android-release-sign install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }} -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true
|
mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=33.0.2 -Dmaven.test.skip=true
|
||||||
mkdir -p forge-gui-android/target/upload
|
mkdir -p forge-gui-android/target/upload
|
||||||
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
|
||||||
mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/
|
mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.robolectric</groupId>
|
<groupId>org.robolectric</groupId>
|
||||||
<artifactId>android-all</artifactId>
|
<artifactId>android-all</artifactId>
|
||||||
<version>10-robolectric-5803371</version>
|
<version>13-robolectric-9030017</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -257,8 +257,8 @@
|
|||||||
<debug>true</debug>
|
<debug>true</debug>
|
||||||
</sign>
|
</sign>
|
||||||
<sdk>
|
<sdk>
|
||||||
<platform>29</platform>
|
<platform>33</platform>
|
||||||
<buildTools>30.0.3</buildTools>
|
<buildTools>33.0.2</buildTools>
|
||||||
</sdk>
|
</sdk>
|
||||||
<dexForceJumbo>true</dexForceJumbo>
|
<dexForceJumbo>true</dexForceJumbo>
|
||||||
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
|
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
|
||||||
@@ -299,6 +299,39 @@
|
|||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<version>1.6.0</version>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>SignV2</id>
|
||||||
|
<phase>install</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>exec</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<workingDirectory>${pom.basedir}</workingDirectory>
|
||||||
|
<executable>java</executable>
|
||||||
|
<arguments>
|
||||||
|
<argument>-jar</argument>
|
||||||
|
<argument>${pom.basedir}/uber-apk-signer.jar</argument>
|
||||||
|
<argument>-a</argument>
|
||||||
|
<argument>target/</argument>
|
||||||
|
<argument>--ks</argument>
|
||||||
|
<argument>forge.keystore</argument>
|
||||||
|
<argument>--ksAlias</argument>
|
||||||
|
<argument>Forge</argument>
|
||||||
|
<argument>--ksKeyPass</argument>
|
||||||
|
<argument>forge72</argument>
|
||||||
|
<argument>--ksPass</argument>
|
||||||
|
<argument>forge72</argument>
|
||||||
|
<argument>--debug</argument>
|
||||||
|
</arguments>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.simpligility.maven.plugins</groupId>
|
<groupId>com.simpligility.maven.plugins</groupId>
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
<artifactId>android-maven-plugin</artifactId>
|
||||||
@@ -343,8 +376,8 @@
|
|||||||
<debug>false</debug>
|
<debug>false</debug>
|
||||||
</sign>
|
</sign>
|
||||||
<sdk>
|
<sdk>
|
||||||
<platform>29</platform>
|
<platform>33</platform>
|
||||||
<buildTools>30.0.3</buildTools>
|
<buildTools>33.0.2</buildTools>
|
||||||
</sdk>
|
</sdk>
|
||||||
<zipalign>
|
<zipalign>
|
||||||
<verbose>false</verbose>
|
<verbose>false</verbose>
|
||||||
@@ -378,110 +411,6 @@
|
|||||||
</dex>
|
</dex>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>android-release-sign</id>
|
|
||||||
<properties>
|
|
||||||
<packaging.type>apk</packaging.type>
|
|
||||||
</properties>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jarsigner-plugin</artifactId>
|
|
||||||
<version>1.3.2</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>signing</id>
|
|
||||||
<goals>
|
|
||||||
<goal>sign</goal>
|
|
||||||
<goal>verify</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>package</phase>
|
|
||||||
<inherited>true</inherited>
|
|
||||||
<configuration>
|
|
||||||
<removeExistingSignatures>true</removeExistingSignatures>
|
|
||||||
<archiveDirectory />
|
|
||||||
<includes>
|
|
||||||
<include>${project.build.directory}/${project.build.finalName}.apk</include>
|
|
||||||
</includes>
|
|
||||||
<keystore>${sign.keystore}</keystore>
|
|
||||||
<alias>${sign.alias}</alias>
|
|
||||||
<storepass>${sign.storepass}</storepass>
|
|
||||||
<keypass>${sign.keypass}</keypass>
|
|
||||||
<verbose>true</verbose>
|
|
||||||
<arguments>
|
|
||||||
<argument>-sigalg</argument>
|
|
||||||
<argument>MD5withRSA</argument>
|
|
||||||
<argument>-digestalg</argument>
|
|
||||||
<argument>SHA1</argument>
|
|
||||||
</arguments>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.simpligility.maven.plugins</groupId>
|
|
||||||
<artifactId>android-maven-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-api</artifactId>
|
|
||||||
<version>2.3.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sun.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-core</artifactId>
|
|
||||||
<version>2.3.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.sun.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-impl</artifactId>
|
|
||||||
<version>2.3.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.activation</groupId>
|
|
||||||
<artifactId>javax.activation-api</artifactId>
|
|
||||||
<version>1.2.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>sun</groupId>
|
|
||||||
<artifactId>misc</artifactId>
|
|
||||||
<version>1</version>
|
|
||||||
<scope>system</scope>
|
|
||||||
<systemPath>${pom.basedir}/libs/sun-misc.jar</systemPath>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.proguard</groupId>
|
|
||||||
<artifactId>proguard-base</artifactId>
|
|
||||||
<version>6.2.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<version>4.6.1</version>
|
|
||||||
<inherited>true</inherited>
|
|
||||||
<configuration>
|
|
||||||
<sign>
|
|
||||||
<debug>false</debug>
|
|
||||||
</sign>
|
|
||||||
<zipalign>
|
|
||||||
<skip>false</skip>
|
|
||||||
<verbose>true</verbose>
|
|
||||||
<inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
|
|
||||||
<outputApk>${project.build.directory}/${project.build.finalName}-signed-aligned.apk</outputApk>
|
|
||||||
</zipalign>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>android-align</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>zipalign</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
|||||||
5
pom.xml
5
pom.xml
@@ -215,6 +215,11 @@
|
|||||||
<version>2.6</version>
|
<version>2.6</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<version>1.6.0</version>
|
||||||
|
</plugin>
|
||||||
<!--This plugin's configuration is used to store Eclipse m2e settings
|
<!--This plugin's configuration is used to store Eclipse m2e settings
|
||||||
only. It has no influence on the Maven build itself. -->
|
only. It has no influence on the Maven build itself. -->
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
Reference in New Issue
Block a user