From 5d8128dc076e81316283839c847b2ed7c917cf65 Mon Sep 17 00:00:00 2001 From: JUUL Mobile Bot Date: Mon, 20 Jun 2022 08:48:32 -0700 Subject: [PATCH 1/7] Update dependency org.jetbrains.kotlinx:kotlinx-metadata-jvm to v0.5.0 (#184) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d683e6bb..9b8d1b18 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { // > As a workaround, it is possible to manually update 'kotlinx-metadata-jvm' version in your project. // // todo: Remove when binary-compatibility-validator bundles support for metadata 1.7.x. - classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2") + classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0") } } From 0fb7de04628a24bf1e693e89aed8c0c9847a8921 Mon Sep 17 00:00:00 2001 From: JUUL Mobile Bot Date: Sat, 2 Jul 2022 16:53:21 -0700 Subject: [PATCH 2/7] Update ktor to v2.0.3 (#189) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 556fe943..25afb0c0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ coroutines = "1.6.1" coroutines-native = "1.6.0-native-mt!!" jacoco = "0.8.7" kotlin = "1.7.0" -ktor = "2.0.2" +ktor = "2.0.3" [libraries] androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.1.1" } From 43cbafa7a277f9b77d2eca8f78b11c2250cdbda7 Mon Sep 17 00:00:00 2001 From: JUUL Mobile Bot Date: Sat, 2 Jul 2022 17:30:51 -0700 Subject: [PATCH 3/7] Update JamesIves/github-pages-deploy-action action to v4.3.4 (#188) --- .github/workflows/gh-pages.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 58bbaa9c..5480aa5d 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -34,9 +34,8 @@ jobs: - run: ./gradlew dokkaHtmlMultiModule - - uses: JamesIves/github-pages-deploy-action@v4.3.3 + - uses: JamesIves/github-pages-deploy-action@v4.3.4 with: - branch: gh-pages folder: build/gh-pages - run: | From 44b278ae4595964369f99b3c826dcb8733557b92 Mon Sep 17 00:00:00 2001 From: JUUL Mobile Bot Date: Sun, 3 Jul 2022 00:34:18 -0700 Subject: [PATCH 4/7] Update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.4.0 (#187) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 25afb0c0..8f46c202 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-coroutines-native = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-native" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.3.3" } +kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.0" } ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" } From 1eaefa6bb4444ffbe2135892ac5d1bb732c8a0b2 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Tue, 5 Jul 2022 10:20:02 -0700 Subject: [PATCH 5/7] Simplify CI to run on only Mac OS (#192) --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e0263e0..2cfe4eb6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,11 +7,7 @@ env: jobs: build: - strategy: - matrix: - os: [ubuntu-20.04, macos-11] - runs-on: ${{ matrix.os }} - + runs-on: macos-11 steps: - uses: actions/checkout@v3 - uses: gradle/wrapper-validation-action@v1 @@ -55,21 +51,17 @@ jobs: -PRELEASE_SIGNING_ENABLED=false \ publishToMavenLocal fi - if: ${{ runner.os == 'macOS' && github.repository_owner == 'JuulLabs' }} - run: ./gradlew jacocoTestReport - if: runner.os == 'Linux' - - uses: EnricoMi/publish-unit-test-result-action@v1 + - uses: EnricoMi/publish-unit-test-result-action/composite@v1 with: files: '**/build/test-results/**/*.xml' report_individual_runs: 'true' - if: runner.os == 'Linux' - uses: codecov/codecov-action@v3 with: fail_ci_if_error: true - if: runner.os == 'Linux' - run: | rm -f ~/.gradle/caches/modules-2/modules-2.lock From 8ec61aa28b4d877ae9700fd0308d451fadaa6577 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Tue, 5 Jul 2022 10:49:55 -0700 Subject: [PATCH 6/7] Fix publish CI process (#191) --- .github/workflows/publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c39ec135..a37a1741 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,7 +32,10 @@ jobs: ${{ runner.os }}-publish- ${{ runner.os }}- - - run: ./gradlew check + # Enabled new memory model for tests to workaround `MockEngine` freezing issue (after upgrading to Ktor 2.0.0). + # https://github.com/JuulLabs/tuulbox/pull/168 + - run: ./gradlew -Pkotlin.native.binary.memoryModel=experimental check + - run: >- ./gradlew --no-parallel From 6fb4f31ec1eaf0b90605bce275703d34981dce60 Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Tue, 5 Jul 2022 11:37:57 -0700 Subject: [PATCH 7/7] Use Temurin 11 JDK for CI (#190) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/gh-pages.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cfe4eb6..59241aa2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: - uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v3 with: - distribution: "adopt-hotspot" - java-version: "11.0.11+9" + distribution: 'temurin' + java-version: '11' - uses: actions/cache@v3 with: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5480aa5d..03f3050b 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -16,8 +16,8 @@ jobs: - uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v3 with: - distribution: "adopt-hotspot" - java-version: "11.0.11+9" + distribution: 'temurin' + java-version: '11' - uses: actions/cache@v3 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a37a1741..7d3047cb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,8 +16,8 @@ jobs: - uses: gradle/wrapper-validation-action@v1 - uses: actions/setup-java@v3 with: - distribution: "adopt-hotspot" - java-version: "11.0.11+9" + distribution: 'temurin' + java-version: '11' - uses: actions/cache@v3 with: