Skip to content

Commit

Permalink
Merge pull request #101 from Malinskiy/feature/deps-update
Browse files Browse the repository at this point in the history
feat(deps): update to kotlin 1.9.10, gradle 8.4, agp 8.1.3
  • Loading branch information
Malinskiy authored Nov 14, 2023
2 parents 28dd793 + ca29a04 commit d0250fc
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 27 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ 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
uses: actions/setup-java@v2
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
Expand Down Expand Up @@ -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 ]
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-sonatype-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-sonatype-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class FileE2ETest {
println()
}

assertThat { async.await() }.isFailure().hasClass(PullFailedException::class)
assertThat(runCatching<Unit> { async.await() }).isFailure().hasClass(PullFailedException::class)
}

assertThat(testFile.exists()).isFalse()
Expand Down
30 changes: 15 additions & 15 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit d0250fc

Please sign in to comment.