diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 5b998e1b..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 2.1 - -orbs: - codecov: codecov/codecov@3 - -jobs: - build: - environment: - GRADLE_OPTS: -Dkotlin.compiler.execution.strategy=in-process - docker: - - image: cimg/android:2022.03.1 - - steps: - - checkout - - - run: - name: Run checks - command: ./gradlew clean test jacocoTestReport lint --continue --console=plain --max-workers=1 --no-daemon - - - store_artifacts: - path: auth0/build/reports - destination: reports - - - store_test_results: - path: auth0/build/test-results - - - codecov/upload - -workflows: - build-and-test: - jobs: - - build diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index fb745c12..20b8e767 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -21,12 +21,14 @@ runs: uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # pin@v4 with: distribution: 'temurin' - java-version: '17' + java-version: ${{ inputs.java-version }} + cache: 'gradle' - - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # pin@v5 - name: Publish Android/Java Packages to Maven shell: bash @@ -36,4 +38,3 @@ runs: MAVEN_PASSWORD: ${{ inputs.ossr-token }} SIGNING_KEY: ${{ inputs.signing-key}} SIGNING_PASSWORD: ${{ inputs.signing-password}} - diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index c0125fd9..6107b35a 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,33 +6,24 @@ inputs: description: The Java version to use required: false default: '17' - gradle: - description: The Gradle version to use - required: false - default: 8.10.2 - kotlin: - description: The Kotlin version to use - required: false - default: 2.0.21 runs: using: composite steps: - name: Set up Java - uses: actions/setup-java@v4 + uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # pin@v4 with: distribution: 'temurin' - java-version: '17' + java-version: ${{ inputs.java }} + cache: 'gradle' - - run: | - curl -s "https://get.sdkman.io" | bash - source "/home/runner/.sdkman/bin/sdkman-init.sh" - sdk install gradle ${{ inputs.gradle }} && sdk default gradle ${{ inputs.gradle }} - sdk install kotlin ${{ inputs.kotlin }} && sdk default kotlin ${{ inputs.kotlin }} - shell: bash + - name: Set up Gradle + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # pin@v5 + with: + gradle-version: wrapper + cache-cleanup: on-success - - run: ./gradlew androidDependencies + - name: Download dependencies + run: ./gradlew androidDependencies shell: bash - - - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c523eb98..c4b1981c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,6 @@ jobs: - uses: ./.github/actions/setup - - run: ./gradlew clean test jacocoTestReport lint --continue --console=plain --max-workers=1 --no-daemon + - run: ./gradlew testReleaseUnitTest jacocoTestReleaseUnitTestReport lintRelease --continue --console=plain - uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # pin@5.5.2 diff --git a/gradle.properties b/gradle.properties index 1e593ff3..0ef1dd88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,8 @@ POM_DEVELOPER_EMAIL=oss@auth0.com org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official + +# CI/CD Performance +org.gradle.caching=true +org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 11581996..81aa1c04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists