Skip to content

Commit

Permalink
Merge pull request #1277 from dimagi/copyOfGradle8
Browse files Browse the repository at this point in the history
[duplicate] Gradle 8
  • Loading branch information
avazirna authored Apr 17, 2024
2 parents 6063ea0 + 3c3f73d commit 1c9b320
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
env:
JAVA_VERSION: '17'
JOB_GRADLE_VERSION: 7.3
FORMPLAYER_GRADLE_VERSION: 7.3
FORMPLAYER_JAVA_VERSION: '8'
JOB_GRADLE_VERSION: 8.1
FORMPLAYER_GRADLE_VERSION: 8.1
FORMPLAYER_JAVA_VERSION: '17'
steps:
- uses: actions/checkout@v3
- name: Set environment for Formplayer
Expand Down
23 changes: 6 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -203,15 +203,15 @@ 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
}


task formTranslateJar(type: Jar, dependsOn: translateClasses) {
baseName = "form_translate"
archiveBaseName = "form_translate"
from sourceSets.translate.output
from sourceSets.main.output
from {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1c9b320

Please sign in to comment.