[BUG] F-Droid can't build

[licaon-kter]

trafficstars

https://monitor.f-droid.org/builds/log/org.samo_lego.canta/91#site-footer

but the other two arches were built fine...and repro

diff log for 91: canta91.log

/LE: fyi https://gitlab.com/fdroid/fdroiddata/-/commit/7acc22457ac29f839f157509bb48ee440fcf6356

[samolego]

Thanks for reporting, that's strange :/ ... I'll need to take a look.

[licaon-kter]

trying to update to the new non-Flutter codebase

  - versionName: 2.1.0
    versionCode: 202
    commit: 77e2864e0083f1c692eb3d95e3801c8838b6c8e8
    subdir: app
    gradle:
      - yes
    binary: https://github.com/samolego/Canta/releases/download/%v/app-release.apk

AllowedAPKSigningKeys: 0a2640317c43272188c3e13194c15460691f12c39ea19bba727dd67fb56289d4

AutoUpdateMode: Version
UpdateCheckMode: Tags
UpdateCheckData: app/gradle.properties|version_code=(\d+)|.|version_name="(.*)"
CurrentVersion: 2.1.0
CurrentVersionCode: 202

but...

 ERROR: Could not build app org.samo_lego.canta: Unexpected version/version code in output; APK: '"2.1.0"' / '202',  Expected: '2.1.0' / '202'

because for some reason.. the versionName in the APK is literally "2.1.0" yes quotes included per https://github.com/samolego/Canta/blob/2.1.0/app/gradle.properties#L3

was this intentional?

/LE: fyi the app build reproducible :tada: just that this naming glitch makes it impossible to update the recipe :smile:

[samolego]

Uf, that's not intentional. I'll fix this rn.

[samolego]

https://github.com/samolego/Canta/releases/tag/2.1.1 this should now be fixed. Thanks for updating fdroid build scheme!

[licaon-kter]

Umm diff log :cry:

--- Canta_2.1.1/smali/z/d0.smali        2024-07-02 10:52:27.269692510 +0000
+++ org.samo_lego.canta_203/smali/z/d0.smali    2024-07-02 10:52:23.901721814 +0000
@@ -30,7 +30,7 @@
 
 
 # direct methods
-.method public constructor <init>(Lz/q0;LB/W;LA0/A;ZZLB/e0;LA0/u;Lz/s0;Lz/A;LP1/c;I)V
+.method public constructor <init>(Lz/q0;LB/W;LA0/A;ZZLB/e0;LA0/u;Lz/s0;Lz/A;Lz/p;I)V
     .locals 1
 
     sget-object v0, Lz/M;->a:Lz/L;
diff -ru Canta_2.1.1/smali/z/f0.smali org.samo_lego.canta_203/smali/z/f0.smali
--- Canta_2.1.1/smali/z/f0.smali        2024-07-02 10:52:27.269692510 +0000
+++ org.samo_lego.canta_203/smali/z/f0.smali    2024-07-02 10:52:23.905721779 +0000
@@ -130,10 +130,14 @@
 
     new-instance v20, Lz/d0;
 
-    iget-object v13, v0, Lz/f0;->o:LA0/u;
-
     iget-object v14, v0, Lz/f0;->p:Lz/s0;
 
+    iget-object v2, v0, Lz/f0;->q:LP1/c;
+
+    move-object/from16 v16, v2
+
+    check-cast v16, Lz/p;
+
     iget-object v7, v0, Lz/f0;->j:Lz/q0;
 
     iget-object v8, v0, Lz/f0;->k:LB/W;
@@ -144,17 +148,15 @@
 
     iget-boolean v11, v0, Lz/f0;->n:Z
 
-    iget-object v2, v0, Lz/f0;->q:LP1/c;
+    iget-object v13, v0, Lz/f0;->o:LA0/u;
 
-    iget v3, v0, Lz/f0;->r:I
+    iget v2, v0, Lz/f0;->r:I
 
     move-object/from16 v6, v20
 
-    move-object/from16 v16, v2
-
-    move/from16 v17, v3
+    move/from16 v17, v2
 
-    invoke-direct/range {v6 .. v17}, Lz/d0;-><init>(Lz/q0;LB/W;LA0/A;ZZLB/e0;LA0/u;Lz/s0;Lz/A;LP1/c;I)V
+    invoke-direct/range {v6 .. v17}, Lz/d0;-><init>(Lz/q0;LB/W;LA0/A;ZZLB/e0;LA0/u;Lz/s0;Lz/A;Lz/p;I)V
 
     new-instance v2, Lz/e0;

[samolego]

Uhh. Is this the reproducible build?

[licaon-kter]

With these differences.... it's not reproducible :)

[samolego]

That's really strange as I haven't changed any of the code :/. I guess more error finding is coming :(

[samolego]

@licaon-kter could you have a look at #85 ? I've done some modifications to build.gradle and changed jdk to 21. Can FDroid build it as reproducible too?

[licaon-kter]

@samolego we need an APK to test, attach it here, rename it as ZIP (do not archive it!) and tell us from which commit you've built

[samolego]

https://github.com/samolego/Canta/issues/85#issuecomment-2442557498

[samolego]

^ hopefully that's ok 🙂.

[samolego]

Built from https://github.com/samolego/Canta/commit/7fb7af8336c2066342c950d6d4fcc7110df4c472