Android manifest update

[Hanmac]

this moves the Android Manifest to the more Default Location for the plugins

and enables manifest-merger goal.

This sets the VersionName and generates the VersionCode from it

[Hanmac]

@Agetian maybe you know why on github we don't need to mess with the d8 file?

[Agetian]

@Agetian maybe you know why on github we don't need to mess with the d8 file?

Hmm, not sure tbh, I haven't investigated the Github way of doing things as far as building and deploying an Android snapshot goes ^^;

[Hanmac]

@Agetian can you look to replace

Forge.CURRENT_VERSION in there:

forge/forge-gui-mobile/src/forge/Forge.java

Line 57 in e2f4c2c

public static final String CURRENT_VERSION = "1.6.63-SNAPSHOT";

BuildInfo.getVersionString ?

forge/forge-core/src/main/java/forge/util/BuildInfo.java

Line 35 in e2f4c2c

public static final String getVersionString() {

that is one of the last pieces where the Version needs to be updated

[Agetian]

Hmm, getVersionString simply returns "GIT" for me (on a snapshot version), with the entire BuildInfo.class.getPackage() method returning "null"... Not sure if it would return a proper version string if executed on an actual release. At any rate, kinda confusing for snapshots as such. I wonder if there's a better way to track the number, hmm...

[Hanmac]

Hmm, getVersionString simply returns "GIT" for me (on a snapshot version), with the entire BuildInfo.class.getPackage() method returning "null"... Not sure if it would return a proper version string if executed on an actual release. At any rate, kinda confusing for snapshots as such. I wonder if there's a better way to track the number, hmm...

Normally, maven should have put the version inside these Manifest files so it can be accessed by getPackage()
I need to check what is missing

[Hanmac]

I think we need https://maven.apache.org/shared/maven-archiver/examples/manifest.html

     <configuration>
         <archive>
             <manifest>
                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
         </archive>
     </configuration>

i will check this out at weekend

[Agetian]

Sounds good!

[Hanmac]

@Agetian the addDefaultImplementationEntries should already be enabled by default

when i run ./forge.sh i already got the correct Forge Version

As for the Android thing, i tried:

JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ mvn -U -B -P android-debug install -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dandroid.sdk.path=/opt/android-sdk/ -T 1C -DskipTests=true

and i get:

[ERROR] Failed to execute goal com.simpligility.maven.plugins:android-maven-plugin:4.6.1:manifest-merger (update-manifest) on project forge-gui-android: Execution update-manifest of goal com.simpligility.maven.plugins:android-maven-plugin:4.6.1:manifest-merger failed: FeatureName must follow [a-zA-Z0-9][a-zA-Z0-9_]* regex, found -> [Help 1]

but i can't find where the problem is happening (it is difficult to debug inside the maven plugin)

[github-actions]

This PR has not been updated in a while nad has been marked on stale. Stale PRs will be auto closed

[Hanmac]

Linked Issue that is causing the problem:
simpligility/android-maven-plugin#814

[Hanmac]

@kevlahnota i don't understand the config there yet:
https://github.com/Card-Forge/android-maven-plugin/blob/b36d05b798f3b5cf1362795f008171309183678e/src/main/java/com/simpligility/maven/plugins/android/standalonemojos/ManifestMergerMojo.java#L120

right now it does reset the VersionCode to 1 🤔

[Hanmac]

@kevlahnota should i try to apply this Commit into this MR too? ad81b0e

[kevlahnota]

@kevlahnota should i try to apply this Commit into this MR too? ad81b0e

Hmm the code there will just remove all non digit from revision - 2.0.00-snapshot, to 2000 and append 0 and MMdd where MM for month and dd for the date so the versioncode if date today is october 10, it will be 200001010 as version code (also append MMdd to the finalname), I don't know if it will work on your MR

[Hanmac]

@kevlahnota i don't understand the config there yet: https://github.com/Card-Forge/android-maven-plugin/blob/b36d05b798f3b5cf1362795f008171309183678e/src/main/java/com/simpligility/maven/plugins/android/standalonemojos/ManifestMergerMojo.java#L120

right now it does reset the VersionCode to 1 🤔

@kevlahnota like i said, right now the manifestVersionCodeUpdateFromVersion doesn't seem to work for me, and the VersionCode in the Manifest is always set to "1".

But i don't understand yet why it does happen, and have no idea on how to debug it

[Hanmac]

@kevlahnota this code right there should have updated the VersionCode

https://github.com/Card-Forge/android-maven-plugin/blob/41bbf85159145c51cb922dde9618c9cf6f138286/src/main/java/com/simpligility/maven/plugins/android/standalonemojos/ManifestMergerMojo.java#L312-L317

in theory, it should have turned 1.6.65-SNAPSHOT into 1006065

but for some reason it doesn't, and I don't know how to debug the maven plugin

not really for snapshots, but that should have been good enough?

[kevlahnota]

@kevlahnota this code right there should have updated the VersionCode

https://github.com/Card-Forge/android-maven-plugin/blob/41bbf85159145c51cb922dde9618c9cf6f138286/src/main/java/com/simpligility/maven/plugins/android/standalonemojos/ManifestMergerMojo.java#L312-L317

in theory, it should have turned 1.6.65-SNAPSHOT into 1006065

but for some reason it doesn't, and I don't know how to debug the maven plugin

not really for snapshots, but that should have been good enough?

did you try to pass the alpha-version?

<configuration>
    <manifestVersionName>${alpha-version}</manifestVersionName>
    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
</configuration>

[Hanmac]

@kevlahnota this code right there should have updated the VersionCode
https://github.com/Card-Forge/android-maven-plugin/blob/41bbf85159145c51cb922dde9618c9cf6f138286/src/main/java/com/simpligility/maven/plugins/android/standalonemojos/ManifestMergerMojo.java#L312-L317
in theory, it should have turned 1.6.65-SNAPSHOT into 1006065
but for some reason it doesn't, and I don't know how to debug the maven plugin
not really for snapshots, but that should have been good enough?

did you try to pass the alpha-version?

<configuration>
    <manifestVersionName>${alpha-version}</manifestVersionName>
    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
</configuration>

The default should be ${project.version}, i will test ${alpha-version} as soon as i get home

[Hanmac]

Ugh, looks like I need to rebase it at home

[Hanmac]

@kevlahnota on my System, i had problems with the working directory.

It only works correct when calling it in forge-gui-android, otherwise the parameter gets messed up?

[kevlahnota]

@kevlahnota on my System, i had problems with the working directory.

It only works correct when calling it in forge-gui-android, otherwise the parameter gets messed up?

I can't figure it out on my system too since its always missing 4 digits that's why I resort to use the build-helper-maven-plugin (timestamp-property for appending monthdate code, regex-property to retain only numeric characters from revision, still missing 1 digit character so I append 0 before the monthdate code ${snapshot-versionCode}0${month.date} on my PR)

[Hanmac]

missing 4 digits

That's why I added this:
<android.manifestMerger.versionDigits>2,2,2,4</android.manifestMerger.versionDigits>

With that, even 1.2.3 is turned into 102030000, so you can use the last 4 digits for snapshot stuff