diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 68dc6e846..145f1af7f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,7 @@ name: ci on: [push, pull_request] jobs: test: - runs-on: macOS-10.15 + runs-on: macos-12 steps: - uses: actions/checkout@v1 - name: Set up JDK 11 @@ -10,7 +10,7 @@ jobs: with: distribution: 'temurin' java-version: '11' - - uses: malinskiy/action-android/install-sdk@release/0.1.1 + - uses: malinskiy/action-android/install-sdk@release/0.1.4 - name: build & test run: ./gradlew assemble test jacocoTestReport - name: Publish Test Report @@ -40,7 +40,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} integration-test: needs: test - runs-on: macOS-10.15 + runs-on: macos-12 strategy: matrix: api: [ 21, 22, 23, 24, 25, 26, 28, 29, 30, 31, 33 ] @@ -51,16 +51,17 @@ jobs: with: distribution: 'temurin' java-version: '11' - - uses: malinskiy/action-android/install-sdk@release/0.1.1 + - uses: malinskiy/action-android/install-sdk@release/0.1.4 - name: integration test - uses: malinskiy/action-android/emulator-run-cmd@release/0.1.1 - timeout-minutes: 20 + uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4 + timeout-minutes: 25 with: cmd: ./gradlew :adam:integrationTest cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 2 -memory 3072 -no-window -gpu swiftshader_indirect api: ${{ matrix.api }} tag: google_apis abi: x86_64 + bootTimeout: 1200 - name: Publish Test Report uses: mikepenz/action-junit-report@v3 if: always() diff --git a/.github/workflows/deploy-github-release.yaml b/.github/workflows/deploy-github-release.yaml index 57f47560f..f8b28b884 100644 --- a/.github/workflows/deploy-github-release.yaml +++ b/.github/workflows/deploy-github-release.yaml @@ -4,7 +4,7 @@ on: tags: '*' jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 - name: Set up JDK 11 diff --git a/.github/workflows/deploy-sonatype-release.yaml b/.github/workflows/deploy-sonatype-release.yaml index 10fb7b07a..ac4bcea01 100644 --- a/.github/workflows/deploy-sonatype-release.yaml +++ b/.github/workflows/deploy-sonatype-release.yaml @@ -4,7 +4,7 @@ on: tags: '*' jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 - name: Set up JDK 11 diff --git a/.github/workflows/deploy-sonatype-snapshot.yaml b/.github/workflows/deploy-sonatype-snapshot.yaml index be9e467f7..12950685b 100644 --- a/.github/workflows/deploy-sonatype-snapshot.yaml +++ b/.github/workflows/deploy-sonatype-snapshot.yaml @@ -7,7 +7,7 @@ on: - '*' jobs: deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 - name: Set up JDK 11 diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 69c6feb65..efbfd4786 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -7,7 +7,7 @@ on: jobs: github-pages: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Set up JDK 11 diff --git a/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/FileE2ETest.kt b/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/FileE2ETest.kt index 7d7daf85f..7d40830ba 100644 --- a/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/FileE2ETest.kt +++ b/adam/src/integrationTest/kotlin/com/malinskiy/adam/integration/FileE2ETest.kt @@ -201,7 +201,7 @@ class FileE2ETest { println() } - assertThat { async.await() }.isFailure().hasClass(PullFailedException::class) + assertThat(runCatching { async.await() }).isFailure().hasClass(PullFailedException::class) } assertThat(testFile.exists()).isFalse() diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index a57151824..e87804b62 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,33 +1,33 @@ object Versions { - val adam = System.getenv("GIT_TAG_NAME") ?: "0.5.1" - val kotlin = "1.8.10" - val coroutines = "1.6.4" + val adam = System.getenv("GIT_TAG_NAME") ?: "0.5.2" + val kotlin = "1.9.10" + val coroutines = "1.7.3" val coroutinesDebug = coroutines val annotations = "24.0.1" - val ktor = "2.3.0" + val ktor = "2.3.6" val logging = "3.0.5" - val vertx = "4.4.1" + val vertx = "4.4.6" val apacheCommonsPool2 = "2.11.1" - val assertk = "0.25" + val assertk = "0.27.0" val junit4 = "4.13.2" - val junit5 = "5.9.2" - val junit5commons = "1.9.2" + val junit5 = "5.10.1" + val junit5commons = "1.10.1" val imageComparison = "4.4.0" val dokka = kotlin - val grpc = "1.54.1" - val grpcKotlin = "1.3.0" - val grpcOkhttp = "1.54.1" - val protobufGradle = "0.9.2" - val protobuf = "3.22.3" + val grpc = "1.59.0" + val grpcKotlin = "1.4.0" + val grpcOkhttp = "1.59.0" + val protobufGradle = "0.9.4" + val protobuf = "3.25.0" val javax = "1.3.2" - val androidGradle = "7.4.1" + val androidGradle = "8.1.3" val testMonitor = "1.6.1" val testRunner = "1.5.2" - val gradleVersionsPlugin = "0.46.0" + val gradleVersionsPlugin = "0.49.0" } object BuildPlugins { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57a0f31f7..f3dc784a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Sun Aug 04 13:21:59 AEST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists