[MOB-7314] Update Gradle, AGP and Maven publishing #662

vbabenkoru · 2023-11-17T06:40:18Z

🔹 Jira Ticket(s) if any

MOB-7314

✏️ Description

I tried updating to next minor versions first, but that required an update to compileSdkVersion, etc. So the only way is to update everything at once.
This updates Gradle, AGP versions, as well as changes Maven publishing to use the new maven-publish plugin.

codecov · 2023-11-18T18:04:52Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (46b0038) 62.50% compared to head (8fc9c29) 62.54%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #662      +/-   ##
==========================================
+ Coverage   62.50%   62.54%   +0.04%     
==========================================
  Files          70       70              
  Lines        4163     4157       -6     
  Branches      479      479              
==========================================
- Hits         2602     2600       -2     
+ Misses       1297     1291       -6     
- Partials      264      266       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

vbabenkoru · 2023-11-21T07:18:41Z

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
      - name: Configure JDK
        uses: actions/setup-java@v1
        with:
-          java-version: 1.8
+          java-version: 11


New Gradle/AGP require Java 11+, bumped it in CI config.

vbabenkoru · 2023-11-21T07:20:06Z

app/build.gradle

@@ -28,7 +31,7 @@ android {
        }

        debug {
-            testCoverageEnabled true
+            enableAndroidTestCoverage true


They changed the behavior of testCoverageEnabled in AGP 7.x, breaking code coverage tooling. I googled the issue and found an AOSP bug ticket for this where they said they deprecated it and added separate options for unit and integration tests. Switched to only use it for integration tests, so that the Android plugin doesn't mess up unit test coverage.

vbabenkoru · 2023-11-21T07:20:19Z

app/build.gradle

@@ -80,6 +83,7 @@ dependencies {

 tasks.withType(Test) {
    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']


Throws exceptions without this.

vbabenkoru · 2023-11-21T07:20:41Z

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.6.21'


New AGP required a Kotlin upgrade too.

vbabenkoru · 2023-11-21T07:21:08Z

gradle.properties

@@ -18,6 +18,7 @@
 # org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
+org.gradle.jvmargs=-Xmx2048m


The build sometimes was throwing OOM errors, so I bumped up heap memory for Gradle.

vbabenkoru · 2023-11-21T07:22:01Z

iterableapi-ui/build.gradle

@@ -2,25 +2,32 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'

 android {
-    compileSdkVersion 29
+    compileSdkVersion 33


The crypto library we're using requires compileSdkVersion 33. It was not enforced in older versions of AGP, but once I bumped it, it wouldn't build without updating compileSdkVersion.

vbabenkoru · 2023-11-21T07:22:25Z

iterableapi-ui/build.gradle

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
    androidTestImplementation 'androidx.test:runner:1.2.0'
    androidTestImplementation 'androidx.test:rules:1.2.0'

 }

 ext {
-    publishedGroupId = 'com.iterable'


All these properties were not used.

vbabenkoru · 2023-11-21T07:22:50Z

iterableapi-ui/build.gradle

 }

-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'


Also removed the JCenter script since we're not publishing there anymore.

vbabenkoru · 2023-11-21T07:23:32Z

maven-push.gradle

@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-apply plugin: 'maven'
+apply plugin: 'maven-publish'


This and the changes below are to use the new Maven Publishing plugin in Gradle 7+. The old plugin is not supported, and the new one required some changes to work.

vbabenkoru · 2023-11-21T07:24:43Z

maven-push.gradle

    }

+    task uploadArchives {


Since the new plugin is using a different name for the Gradle task, and I didn't want to change our documentation on releases, I just aliased the old task name to the new task name.

Ayyanchira · 2023-11-21T15:06:47Z

app/build.gradle

@@ -167,5 +171,5 @@ task jacocoDebugAndroidTestReport(type: JacocoReport, dependsOn: ['connectedChec
    classDirectories.from = files([debugTree])
    additionalSourceDirs.from = files([sdkSrc, sdkUiSrc])
    additionalClassDirs.from = files([sdkTree, sdkUiTree])
-    executionData.from = fileTree(dir: "$buildDir", include: "outputs/code_coverage/debugAndroidTest/connected/*.ec")
+    executionData.from = fileTree(dir: "$buildDir", include: "outputs/code_coverage/debugAndroidTest/connected/**/*.ec")


what does this path change signify?

The updated versions changed where it stores the code coverage data file, adding it to a folder with the name of the device, so I had to change the pattern.

Ayyanchira

Checked the changes... Added some questions for clarification. Will test it locally now

Ayyanchira · 2023-11-21T15:12:01Z

.github/workflows/build.yml

@@ -118,7 +118,7 @@ jobs:

      - run: bash <(curl -s https://codecov.io/bash)
      - run: ./cc-test-reporter format-coverage app/build/reports/jacoco/jacocoDebugTestReport/jacocoDebugTestReport.xml --input-type jacoco -d
-      - run: ./cc-test-reporter format-coverage iterableapi/build/reports/coverage/debug/report.xml --input-type jacoco -d
+      - run: ./cc-test-reporter format-coverage iterableapi/build/reports/coverage/androidTest/debug/connected/report.xml --input-type jacoco -d


Is it a residue of Java 11 change?

The updated version of AGP changed the path to this report.

Ayyanchira · 2023-11-21T15:13:05Z

app/build.gradle

+    buildToolsVersion '33.0.2'
+
+    namespace 'com.iterable.iterableapi.testapp'
+    testNamespace 'iterable.com.iterableapi'


Looks like all build.gradle files now have namespace. Is it for better separation of context?

The migration assistant moved this stuff from AndroidManifest.xml here, namespace and testNamespace are new properties, replacing applicationId in the Gradle file and package in the xml.

Ayyanchira · 2023-11-21T15:15:33Z

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.iterable.iterableapi.testapp">


I wonder why the package existed before then?

This was moved/renamed to namespace.

Ayyanchira · 2023-11-21T15:45:24Z

sample-apps/inbox-customization/app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'

 android {
    compileSdkVersion 33
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "33.0.2"


Does this need to be specified? Is there a way its automatically predetermined using current Android gradle plugin as stated here?

Ah yeah, we can remove that too. I'd leave it for now though, I think it's better if the compile and build tools versions match.

Ayyanchira

A very important PR! Thanks a tonn!
Tester App and the SDK runs smoothly and unit tests are also easily runnable via Tester app project. The problems of de-linked files (showing red lines in test classes) are all gone as well.
👍🏼

vbabenkoru added 6 commits November 16, 2023 22:39

Update Gradle and AGP to the latest minor versions

059c9d9

Update compileSdkVersion and buildToolsVersion

8b1c895

Use Java 11

f540abc

Update AGP to 7.4.2 and Gradle to 7.5

318385c

Change Maven publishing to use the new Gradle plugin

c20942d

Update unit test libraries

0b1d72a

vbabenkoru changed the title ~~[MOB-7314] Update Gradle and AGP to the latest minor versions~~ [MOB-7314] Update Gradle, AGP and Maven publishing Nov 18, 2023

vbabenkoru added 2 commits November 18, 2023 09:49

Fix Jacoco

1c33d9d

Update unit test libraries for app

69af480

vbabenkoru force-pushed the chore/MOB-7314-update-gradle branch from 8f0970e to 69af480 Compare November 18, 2023 17:50

vbabenkoru requested a review from evantk91 November 18, 2023 17:50

Make an uploadArchives alias for backwards compatibility

ec11220

vbabenkoru added 2 commits November 19, 2023 22:37

Remove testCoverageEnabled

81ecb9e

Enable enableAndroidTestCoverage

13ac86e

Ayyanchira self-requested a review November 20, 2023 17:59

Increase Gradle memory

44eaaa8

vbabenkoru force-pushed the chore/MOB-7314-update-gradle branch from f49518d to 5605808 Compare November 20, 2023 19:30

Update coverage xml path

8fc9c29

vbabenkoru force-pushed the chore/MOB-7314-update-gradle branch from 5605808 to 8fc9c29 Compare November 20, 2023 21:11

vbabenkoru commented Nov 21, 2023

View reviewed changes

Ayyanchira reviewed Nov 21, 2023

View reviewed changes

Ayyanchira approved these changes Nov 22, 2023

View reviewed changes

vbabenkoru merged commit 3dd3939 into master Nov 22, 2023
5 checks passed

vbabenkoru deleted the chore/MOB-7314-update-gradle branch November 22, 2023 23:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MOB-7314] Update Gradle, AGP and Maven publishing #662

[MOB-7314] Update Gradle, AGP and Maven publishing #662

vbabenkoru commented Nov 17, 2023 •

edited

Loading

codecov bot commented Nov 18, 2023 •

edited

Loading

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira left a comment

Ayyanchira Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira Nov 21, 2023

vbabenkoru Nov 21, 2023

Ayyanchira left a comment

		}

		apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

[MOB-7314] Update Gradle, AGP and Maven publishing #662

[MOB-7314] Update Gradle, AGP and Maven publishing #662

Conversation

vbabenkoru commented Nov 17, 2023 • edited Loading

🔹 Jira Ticket(s) if any

✏️ Description

codecov bot commented Nov 18, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ayyanchira left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ayyanchira left a comment

Choose a reason for hiding this comment

vbabenkoru commented Nov 17, 2023 •

edited

Loading

codecov bot commented Nov 18, 2023 •

edited

Loading