Fix broken build

Our build has been broken since jcenter.bintray.com shutdown in August 2024. Use JitPack to fetch Mezzanine. JitPack could not build our Permissions library so we use a local binary instead. Same for netcipher-webkit. Close #650
Slion · Dec 28, 2024 · 97c7c8a · 97c7c8a
1 parent a25a034
commit 97c7c8a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -162,25 +162,25 @@ android {
         // Undefined publisher do not add application ID suffix
         undef {
             dimension "PUBLISHER"
-            buildConfigField "Sponsorship", "SPONSORSHIP", "Sponsorship.BRONZE"
+            buildConfigField "fulguris.Sponsorship", "SPONSORSHIP", "fulguris.Sponsorship.BRONZE"
         }
 
         playstore {
             dimension "PUBLISHER"
             applicationIdSuffix ".playstore"
-            buildConfigField "Sponsorship", "SPONSORSHIP", "Sponsorship.TIN"
+            buildConfigField "fulguris.Sponsorship", "SPONSORSHIP", "fulguris.Sponsorship.TIN"
         }
 
         download {
             dimension "PUBLISHER"
             applicationIdSuffix ".download"
-            buildConfigField "Sponsorship", "SPONSORSHIP", "Sponsorship.BRONZE"
+            buildConfigField "fulguris.Sponsorship", "SPONSORSHIP", "fulguris.Sponsorship.BRONZE"
         }
 
         fdroid {
             dimension "PUBLISHER"
             applicationIdSuffix ".fdroid"
-            buildConfigField "Sponsorship", "SPONSORSHIP", "Sponsorship.BRONZE"
+            buildConfigField "fulguris.Sponsorship", "SPONSORSHIP", "fulguris.Sponsorship.BRONZE"
         }
 
     }
@@ -309,8 +309,15 @@ dependencies {
 
     // file reading
     final def mezzanineVersion = '1.1.1'
-    implementation "com.anthonycr.mezzanine:mezzanine:$mezzanineVersion"
-    kapt "com.anthonycr.mezzanine:mezzanine-compiler:$mezzanineVersion"
+    // Available on JitPack: https://jitpack.io/#anthonycr/Mezzanine
+    implementation "com.github.anthonycr.Mezzanine:mezzanine:$mezzanineVersion"
+    kapt "com.github.anthonycr.Mezzanine:mezzanine-compiler:$mezzanineVersion"
+    // Just using the local JAR won't work as is since the compiler has other unresolved dependencies
+    // We notably get java.lang.ClassNotFoundException: org.apache.commons.lang3.StringEscapeUtils when compiling
+    // See: https://stackoverflow.com/questions/28504174/noclassdeffounderror-org-apache-commons-lang3-stringutils
+    // Those dependencies are defined in the POM XML of the mezzanine-compiler package
+    //implementation files("libs/mezzanine-${mezzanineVersion}.jar")
+    //kapt files("libs/mezzanine-compiler-${mezzanineVersion}.jar")
 
     // dependency injection
     implementation "com.google.dagger:dagger:$daggerVersion"
@@ -321,7 +328,12 @@ dependencies {
     compileOnly 'javax.annotation:jsr250-api:1.0'
 
     // permissions
-    implementation 'com.anthonycr.grant:permissions:1.1.2'
+    //implementation 'com.anthonycr.grant:permissions:1.1.2'
+    // JitPack build fails see: https://jitpack.io/#anthonycr/Grant
+    //implementation 'com.github.anthonycr:Grant:v1.1.2'
+    // Use local library binary instead
+    // TODO: Update that library or remove it
+    implementation files('libs/permissions-1.1.2.aar')
 
     // proxy support
     implementation 'net.i2p.android:client:0.9.49'
@@ -337,7 +349,10 @@ dependencies {
     // tor proxy
     implementation "info.guardianproject.netcipher:netcipher:2.1.0"
     // Updating this breaks our build
-    implementation "info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1"
+    //implementation "info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1"
+    // Use local library binary
+    // TODO: Update that library or remove it
+    implementation files('libs/netcipher-webkit-2.0.0-alpha1.jar')
 
     // memory leak analysis
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'

diff --git a/app/libs/mezzanine-1.1.1.jar b/app/libs/mezzanine-1.1.1.jar
diff --git a/app/libs/mezzanine-compiler-1.1.1.jar b/app/libs/mezzanine-compiler-1.1.1.jar
diff --git a/app/libs/netcipher-webkit-2.0.0-alpha1.jar b/app/libs/netcipher-webkit-2.0.0-alpha1.jar
diff --git a/app/libs/permissions-1.1.2.aar b/app/libs/permissions-1.1.2.aar
diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,9 @@ buildscript {
         google()
         mavenCentral()
         gradlePluginPortal()
+        maven {
+            url 'https://jitpack.io'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.3.1'