From 7072ce91f24d53f46775f51ee21fd2e6330e63b0 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 27 Apr 2023 17:32:40 -0300
Subject: [PATCH 1/4] update property names for gradle 8 apis

---
 build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8fd168cfd..a436f2c8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,13 +143,13 @@ dependencies {
 }
 
 jar {
-    baseName = "commcare-libraries"
+    archiveBaseName = "commcare-libraries"
 }
 
 jar.dependsOn test
 
 task cliJar(type: Jar, dependsOn: cliClasses) {
-    baseName = "commcare-cli"
+    archiveBaseName = "commcare-cli"
     from sourceSets.translate.output
     from sourceSets.cli.output
     from sourceSets.main.output
@@ -168,7 +168,7 @@ task cliJar(type: Jar, dependsOn: cliClasses) {
 }
 
 task ccapiJar(type: Jar, dependsOn: ccapiClasses) {
-    baseName = "commcare-api"
+    archiveBaseName = "commcare-api"
     from sourceSets.ccapi.output
     from sourceSets.main.output
     from {
@@ -183,7 +183,7 @@ task ccapiJar(type: Jar, dependsOn: ccapiClasses) {
 }
 
 task harnessJar(type: Jar, dependsOn: translateClasses) {
-    baseName = "javarosa-cli"
+    archiveBaseName = "javarosa-cli"
     from sourceSets.translate.output
     from sourceSets.main.output
     from {
@@ -203,7 +203,7 @@ task harnessJar(type: Jar, dependsOn: translateClasses) {
 // used to provide the test source files to external projects, such as commcare-android,
 // which might want to import classes
 task testsrcJar(type: Jar, dependsOn: testClasses) {
-    classifier = 'tests'
+    archiveClassifier = 'tests'
     from files(sourceSets.test.output)
     from files(sourceSets.cli.output)
     duplicatesStrategy = DuplicatesStrategy.FAIL
@@ -211,7 +211,7 @@ task testsrcJar(type: Jar, dependsOn: testClasses) {
 
 
 task formTranslateJar(type: Jar, dependsOn: translateClasses) {
-    baseName = "form_translate"
+    archiveBaseName = "form_translate"
     from sourceSets.translate.output
     from sourceSets.main.output
     from {

From 2eb98dc224c2342f57a0717d45bc69ad8113e46e Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 27 Apr 2023 17:44:47 -0300
Subject: [PATCH 2/4] update gradle version for git actions

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4769769fb..c475f5f12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,8 +16,8 @@ jobs:
     env:
       JAVA_VERSION: '17'
       JOB_GRADLE_VERSION: 7.3
-      FORMPLAYER_GRADLE_VERSION: 7.3
-      FORMPLAYER_JAVA_VERSION: '8'
+      FORMPLAYER_GRADLE_VERSION: 8.1
+      FORMPLAYER_JAVA_VERSION: '17'
     steps:
       - uses: actions/checkout@v3
       - name: Set environment for Formplayer

From 843bb42b5fef7efdabdbe8a1e74387b3211e5fae Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 27 Apr 2023 18:00:44 -0300
Subject: [PATCH 3/4] remove old fix for Jenkins test as we are using Github
 Actions and gradle now

---
 build.gradle | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index a436f2c8a..44258c5aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -257,17 +257,6 @@ task extractLibs(type: Copy) {
 
 compileJava.dependsOn extractLibs
 
-
-task jenkinsTest {
-    inputs.files test.outputs.files
-    doLast {
-        def timestamp = System.currentTimeMillis()
-        test.getReports().getJunitXml().getDestination().eachFile { it.lastModified = timestamp }
-    }
-}
-
-check.dependsOn(jenkinsTest)
-
 jmh {
     duplicateClassesStrategy = DuplicatesStrategy.FAIL
     fork = 2

From 3c3f73dc917a1d1706f7e969fb48d4642ec368c2 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 4 May 2023 10:43:19 -0300
Subject: [PATCH 4/4] update gradle version for git actions

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c475f5f12..91683bfe7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_VERSION: '17'
-      JOB_GRADLE_VERSION: 7.3
+      JOB_GRADLE_VERSION: 8.1
       FORMPLAYER_GRADLE_VERSION: 8.1
       FORMPLAYER_JAVA_VERSION: '17'
     steps: