fixes #5208: Gradle build fails with android studio flamingo update #5220

sivasubramaniamv · 2023-05-03T06:02:26Z

What changes did you make and why?

Upgraded Gradle version from 6.9 to 8.1.1
Upgraded AGP version from 4.0.1 to 8.0.0

Tested betaDebug on

Realme 3 Pro with API level 30 (Android 11)

Individual comments have been added to specific changes. Changes that do not contain individual comments are either self-explanatory or made by the AGP upgrade assistant.

Note: As part of this upgrade a change was required in translatewiki which has been merged.

sivasubramaniamv · 2023-05-03T06:21:47Z

app/build.gradle

@@ -168,7 +168,7 @@ project.gradle.taskGraph.whenReady {
 }

 android {
-    compileSdkVersion 31
+    compileSdkVersion 33


Changed CompileSdkVersion from 31 to 33. Fixes error as described in this stack overflow issue.

sivasubramaniamv · 2023-05-03T06:26:39Z

app/build.gradle

-    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"){
-        force = true //API 19 support
+    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION!!"){
+        //force = true //API 19 support


Forcing dependency versions using force = true on a first-level dependency has been deprecated.

Refer to Gradle documentation.

Also, the minSdkVersion is 29 for this project.

Also, the minSdkVersion is 29 for this project.

We've pushed it back to 21, recently. I hope that doesn't affect this change 🙂

sivasubramaniamv · 2023-05-03T06:35:53Z

app/build.gradle

@@ -341,7 +340,11 @@ android {
    buildFeatures {
        viewBinding true
    }
-
+    namespace 'fr.free.nrw.commons'


Added the namespace DSL to the android {} block in the module-level build.gradle file and removed the package attribute in the manifest.

This change was made as part of preparing the app build for the Android Studio Flamingo release.

Refer to this medium article.

sivasubramaniamv · 2023-05-03T06:43:09Z

app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt

@@ -16,7 +16,7 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {
    private val SWIPE_THRESHOLD_WIDTH = (getScreenResolution(context!!)).first / 3
    private val SWIPE_VELOCITY_THRESHOLD = 1000

-    override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean {
+    override fun onTouch(view: View?, motionEvent: MotionEvent): Boolean {


Changed parameter type from motionEvent: MotionEvent? to MotionEvent.

Fixes error: Type mismatch: inferred type is MotionEvent? but MotionEvent was expected

sivasubramaniamv · 2023-05-03T06:44:05Z

app/src/main/java/fr/free/nrw/commons/customselector/helper/OnSwipeTouchListener.kt

@@ -32,7 +32,7 @@ open class OnSwipeTouchListener(context: Context?) : View.OnTouchListener {

    inner class GestureListener : GestureDetector.SimpleOnGestureListener() {

-        override fun onDown(e: MotionEvent?): Boolean {
+        override fun onDown(e: MotionEvent): Boolean {


Changed parameter type from e: MotionEvent? to MotionEvent.

Fixes error: 'onDown' overrides nothing

sivasubramaniamv · 2023-05-03T07:12:16Z

build.gradle

+        gradlePluginPortal() // potential jcenter() replacement
+        maven { url "https://jitpack.io" }
+        maven { url "https://maven.google.com" }
+    }


Replaced deprecated jcenter() convenience method with gradlePluginPortal() as JCenter was shutdown.

Gradle Plugin Portal was added as the JCenter dependency CircleProgressBar 1.1.1 was not available on Maven Central.

Refer to this stack overflow issue and this github issue.

sivasubramaniamv · 2023-05-03T07:49:55Z

gradle.properties

@@ -14,7 +14,6 @@
 # org.gradle.parallel=true
 #Thu Mar 01 15:28:48 IST 2018
 org.gradle.jvmargs=-Xmx1536M
-android.enableBuildCache=true


Removed android.enableBuildCache = true

Gradle build cache has superseded Android-specific build caches.

Gradle build cache has superseded Android-specific build caches.

Do we not need to add org.gradle.caching=true in our gradle.properties to enable Gradle build cache ? 🤔

sivasubramaniamv · 2023-05-03T07:56:23Z

gradle.properties

Changed android.jetifier.blacklist to android.jetifier.ignorelist.

Refer to this GitHub comment for more detail.

sivasubramaniamv · 2023-05-03T13:18:33Z

data-client/build.gradle

Removed code for publishing library that caused a few errors. Library publishing code is unnecessary as the library is discontinued and contained within the main project.

nicolas-raoul

The app is building and running fine with this PR merged.
I will test a bit more and merge if @sivaraam and @RitikaPahwa4444 are OK.

sivaraam

Thanks for taking this up and making the app works on newer Android Studio versions!

For the note, the version 8 of Android Gradle plugin seems to bump the JDK requirement to 17. Mentioning it here just for reference. In case anyone is stuck with Java 11 or so, they could bump the Gradle plugin down to 7.3.1. The app seems to build fine with that too. Also that Gradle plugin version enables the building the app on Android Studio Dolphin and also likely on the Electric Eel version.

sivaraam · 2023-06-25T18:15:19Z

build.gradle

        mavenCentral()
        maven { url "https://plugins.gradle.org/m2/" }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'


Looks like 8.0.2 is already out. Could you kindly bump this up to 8.0.2 ?

sivaraam · 2023-06-25T18:53:32Z

It also seems like the GitHub workflow would need to be tweaked a bit to start using JDK 17 due to the changes in this MR. Could you kindly adjust that too @siva-subramaniam-v ?

sivasubramaniamv · 2023-06-26T15:17:48Z

@sivaraam I tried making the CI work, but it doesn't seem to be working. I don't have much experience working with CI. Please assign it to someone with prior experience.

sivaraam · 2023-07-08T18:20:31Z

@sivaraam I tried making the CI work, but it doesn't seem to be working. I don't have much experience working with CI. Please assign it to someone with prior experience.

I've tried putting in a change which should hopefully fix the pipeline. Let's see 🤞🏼

nicolas-raoul · 2023-07-09T14:17:50Z

fr.free.nrw.commons.AboutActivityUnitTests > checkActivityNotNull FAILED
    java.lang.NoSuchMethodError at ProxyMaker.java:111

:'-(

nicolas-raoul · 2023-09-17T08:37:23Z

If you update roboelectric to 4.10.3, the number of failed tests falls from all to only 5. :-)
It is OK to add an @Ignore to these 5 unit tests, and create an issue so that someone can fix them in the future.

shankarpriyank · 2023-09-21T16:04:16Z

hi @siva-subramaniam-v can you please push this fix, it would help a lot

If you update roboelectric to 4.10.3, the number of failed tests falls from all to only 5. :-) It is OK to add an @Ignore to these 5 unit tests, and create an issue so that someone can fix them in the future.

nicolas-raoul · 2023-10-01T09:59:20Z

Now would be a great time to merge this.
Sorry for the delay, but would you mind rebasing (or pulling) from the latest main branch?
Thanks a lot!

This is as per the observation of Nicolas Raoul in the MR. He mentions this brings down test failures to just 5. Ref: #5220 (comment)

nicolas-raoul · 2023-10-16T01:59:27Z

I successfully uploaded a picture using prodRelease of this branch:
https://commons.wikimedia.org/wiki/File:March_2007_night_in_Valetta_9.jpg

nicolas-raoul · 2023-10-16T02:44:37Z

The next task is to fix the unit tests, they all fail with this stacktrace:

 fr.free.nrw.commons.AboutActivityUnitTests > checkActivityNotNull FAILED
    org.mockito.exceptions.base.MockitoException at TestCommonsApplication.kt:81
        Caused by: org.mockito.exceptions.base.MockitoException at TypeCache.java:152
            Caused by: java.lang.IllegalStateException at InlineBytecodeGenerator.java:177
                Caused by: java.lang.IllegalArgumentException at ClassReader.java:184

Updating jacoco.gradle's toolVersion to 0.8.10 does not fix them.
In app/build.gradle I see that we are using 2.* mockito packages, while the latest versions seem to be 5.*, time to update maybe?

How about releasing a beta right now even though the unit tests fail? By doing so, we give more time to testers while we fix the unit tests (thus allowing us to shorten a bit the final beta test phase).

sivaraam · 2023-10-16T04:30:54Z

How about releasing a beta right now even though the unit tests fail? By doing so, we give more time to testers while we fix the unit tests (thus allowing us to shorten a bit the final beta test phase).

Ok Nicolas. Let us keep the changes of this MR in a separate release branch and release the beta from there. We could merge to main once we've fixed the unit tests. Right now the v4.2.0-release has all the changes of this MR. Let's use the same 👍🏼

nicolas-raoul · 2023-10-16T04:39:17Z

Sounds good, thanks! :-)

sivaraam · 2023-10-17T02:29:34Z

Thanks a lot for contributing this change @siva-subramaniam-v ! It helped much for the release of the app 🙂

For the note, we're looking to address the unit test failures as a separate issue (#5339)

sivasubramaniamv commented May 3, 2023

View reviewed changes

sivasubramaniamv mentioned this pull request May 3, 2023

Gradle build fails with Android Studio Flamingo update #5208

Closed

nicolas-raoul approved these changes Jun 24, 2023

View reviewed changes

sivaraam reviewed Jun 25, 2023

View reviewed changes

shankarpriyank mentioned this pull request Jul 3, 2023

Lossless Transformations(Rotate feature) #5252

Merged

sivaraam mentioned this pull request Oct 4, 2023

Fix prodRelease flavor build, probably by updating Proguard #5323

Closed

sivaraam added a commit that referenced this pull request Oct 15, 2023

Upgrade robolectric to fix unit tests

e5e3a6b

This is as per the observation of Nicolas Raoul in the MR. He mentions this brings down test failures to just 5. Ref: #5220 (comment)

Empty commit to enable merge

870d138

sivaraam changed the base branch from main to v4.2.0-release October 17, 2023 02:28

sivaraam merged commit 26eaa46 into commons-app:v4.2.0-release Oct 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fixes #5208: Gradle build fails with android studio flamingo update #5220

fixes #5208: Gradle build fails with android studio flamingo update #5220

sivasubramaniamv commented May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivaraam Jun 25, 2023

sivasubramaniamv May 3, 2023

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivaraam Jun 25, 2023

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023

nicolas-raoul left a comment

sivaraam left a comment

sivaraam Jun 25, 2023

sivaraam commented Jun 25, 2023 •

edited

Loading

sivasubramaniamv commented Jun 26, 2023

sivaraam commented Jul 8, 2023

nicolas-raoul commented Jul 9, 2023

nicolas-raoul commented Sep 17, 2023 •

edited

Loading

shankarpriyank commented Sep 21, 2023

nicolas-raoul commented Oct 1, 2023

nicolas-raoul commented Oct 16, 2023

nicolas-raoul commented Oct 16, 2023

sivaraam commented Oct 16, 2023 •

edited

Loading

nicolas-raoul commented Oct 16, 2023

sivaraam commented Oct 17, 2023 •

edited

Loading

fixes #5208: Gradle build fails with android studio flamingo update #5220

fixes #5208: Gradle build fails with android studio flamingo update #5220

Conversation

sivasubramaniamv commented May 3, 2023 • edited Loading

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivaraam Jun 25, 2023

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivaraam Jun 25, 2023

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023 • edited Loading

Choose a reason for hiding this comment

sivasubramaniamv May 3, 2023

Choose a reason for hiding this comment

nicolas-raoul left a comment

Choose a reason for hiding this comment

sivaraam left a comment

Choose a reason for hiding this comment

sivaraam Jun 25, 2023

Choose a reason for hiding this comment

sivaraam commented Jun 25, 2023 • edited Loading

sivasubramaniamv commented Jun 26, 2023

sivaraam commented Jul 8, 2023

nicolas-raoul commented Jul 9, 2023

nicolas-raoul commented Sep 17, 2023 • edited Loading

shankarpriyank commented Sep 21, 2023

nicolas-raoul commented Oct 1, 2023

nicolas-raoul commented Oct 16, 2023

nicolas-raoul commented Oct 16, 2023

sivaraam commented Oct 16, 2023 • edited Loading

nicolas-raoul commented Oct 16, 2023

sivaraam commented Oct 17, 2023 • edited Loading

sivasubramaniamv commented May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivasubramaniamv May 3, 2023 •

edited

Loading

sivaraam commented Jun 25, 2023 •

edited

Loading

nicolas-raoul commented Sep 17, 2023 •

edited

Loading

sivaraam commented Oct 16, 2023 •

edited

Loading

sivaraam commented Oct 17, 2023 •

edited

Loading