From 94f2eccfae35050a3363f77030bc22c8d7422375 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 6 Dec 2024 09:40:07 +0100 Subject: [PATCH 1/5] GitHub Actions: update JDK [17 -> 21] --- .github/workflows/assemble-test-lint.yml | 8 ++++---- api/build.gradle.kts | 5 +++++ app/build.gradle.kts | 5 +++++ backend/build.gradle.kts | 5 +++++ billing/build.gradle.kts | 5 +++++ gradle.properties | 3 +++ widgets/build.gradle.kts | 5 +++++ 7 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/assemble-test-lint.yml b/.github/workflows/assemble-test-lint.yml index 26a84ca156..c33a1c8bd7 100644 --- a/.github/workflows/assemble-test-lint.yml +++ b/.github/workflows/assemble-test-lint.yml @@ -22,10 +22,10 @@ jobs: steps: - name: Check out uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: gradle @@ -54,10 +54,10 @@ jobs: steps: - name: Check out uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: gradle diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 78f8caf668..1c26a31191 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -11,6 +11,11 @@ val sgCompileSdk: Int by rootProject.extra val sgMinSdk: Int by rootProject.extra val sgTargetSdk: Int by rootProject.extra +tasks.withType(JavaCompile::class.java).configureEach { + // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support + options.compilerArgs.add("-Xlint:-options") +} + android { namespace = "com.battlelancer.seriesguide.api" compileSdk = sgCompileSdk diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3ef9106ddd..988779784f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,6 +22,11 @@ val sgTargetSdk: Int by rootProject.extra val sgVersionCode: Int by rootProject.extra val sgVersionName: String by rootProject.extra +tasks.withType(JavaCompile::class.java).configureEach { + // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support + options.compilerArgs.add("-Xlint:-options") +} + android { namespace = "com.battlelancer.seriesguide" compileSdk = sgCompileSdk diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index 1b863719f2..f06c80626d 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -7,6 +7,11 @@ plugins { val sgCompileSdk: Int by rootProject.extra val sgMinSdk: Int by rootProject.extra +tasks.withType(JavaCompile::class.java).configureEach { + // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support + options.compilerArgs.add("-Xlint:-options") +} + android { namespace = "com.uwetrottmann.seriesguide.backend" compileSdk = sgCompileSdk diff --git a/billing/build.gradle.kts b/billing/build.gradle.kts index c19c6bb0ff..dc65c3acb7 100644 --- a/billing/build.gradle.kts +++ b/billing/build.gradle.kts @@ -7,6 +7,11 @@ plugins { val sgCompileSdk: Int by rootProject.extra val sgMinSdk: Int by rootProject.extra +tasks.withType(JavaCompile::class.java).configureEach { + // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support + options.compilerArgs.add("-Xlint:-options") +} + android { namespace = "com.uwetrottmann.seriesguide.billing" compileSdk = sgCompileSdk diff --git a/gradle.properties b/gradle.properties index adb4adeaf2..cd778232ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,6 @@ android.useAndroidX=true # Do not turn on full mode for as long as possible: looking at unused.txt diff there are many # differences with an increased risk of breaking things. android.enableR8.fullMode=false + +# JDK 21 still supports source and target value 8, it will be removed in a future release +android.javaCompile.suppressSourceTargetDeprecationWarning=true diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts index 11003b1471..cba726130f 100644 --- a/widgets/build.gradle.kts +++ b/widgets/build.gradle.kts @@ -6,6 +6,11 @@ plugins { val sgCompileSdk: Int by rootProject.extra val sgMinSdk: Int by rootProject.extra +tasks.withType(JavaCompile::class.java).configureEach { + // Suppress JDK 21 warning about deprecated, but not yet removed, source and target value 8 support + options.compilerArgs.add("-Xlint:-options") +} + android { namespace = "com.uwetrottmann.seriesguide.widgets" compileSdk = sgCompileSdk From 811913058fab857c57befb652b743157defe2e3a Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 6 Dec 2024 10:10:39 +0100 Subject: [PATCH 2/5] Build: format app build script --- app/build.gradle.kts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 988779784f..2b19970b07 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -76,7 +76,8 @@ android { jvmTarget = JavaVersion.VERSION_1_8.toString() // Using experimental flatMapLatest for Paging 3 // Using experimental Material 3 compose APIs - freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi,androidx.compose.material3.ExperimentalMaterial3Api" + freeCompilerArgs = + freeCompilerArgs + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi,androidx.compose.material3.ExperimentalMaterial3Api" } lint { @@ -97,7 +98,8 @@ android { productFlavors { create("pure") { - isDefault = true // Make Studio select this by default, it often resets (after updates, randomly) + // Make Studio select this by default, it often resets (after updates, randomly) + isDefault = true applicationId = "com.battlelancer.seriesguide" versionCode = sgVersionCode @@ -208,7 +210,7 @@ dependencies { // Optional - Integration with activities implementation(libs.androidx.activity.compose) // Optional - Integration with ViewModels - implementation( libs.androidx.lifecycle.compose) + implementation(libs.androidx.lifecycle.compose) // ViewModel and LiveData implementation(libs.androidx.lifecycle.livedata) From b7b119003782771431cb274bfd744808d47bfd59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:51:49 +0000 Subject: [PATCH 3/5] Bump actions/checkout from 4.1.7 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/assemble-test-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/assemble-test-lint.yml b/.github/workflows/assemble-test-lint.yml index c33a1c8bd7..cd252c96a1 100644 --- a/.github/workflows/assemble-test-lint.yml +++ b/.github/workflows/assemble-test-lint.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Check out - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 21 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: @@ -53,7 +53,7 @@ jobs: steps: - name: Check out - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 21 uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: From 4a1601059dc3f91e0da7898650442ab9f2fb3748 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:51:52 +0000 Subject: [PATCH 4/5] Bump actions/setup-java from 4.2.1 to 4.5.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.1 to 4.5.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/99b8673ff64fbf99d8d325f52d9a5bdedb8483e9...8df1039502a15bceb9433410b1a100fbe190c53b) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/assemble-test-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/assemble-test-lint.yml b/.github/workflows/assemble-test-lint.yml index cd252c96a1..2b256626a6 100644 --- a/.github/workflows/assemble-test-lint.yml +++ b/.github/workflows/assemble-test-lint.yml @@ -23,7 +23,7 @@ jobs: - name: Check out uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 21 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 with: java-version: '21' distribution: 'temurin' @@ -55,7 +55,7 @@ jobs: - name: Check out uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up JDK 21 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 with: java-version: '21' distribution: 'temurin' From 3c6859887d912b5656f49d6060b7c3dd92ef5d83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 11:51:55 +0000 Subject: [PATCH 5/5] Bump actions/upload-artifact from 4.3.3 to 4.4.3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/assemble-test-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assemble-test-lint.yml b/.github/workflows/assemble-test-lint.yml index 2b256626a6..02fcec2309 100644 --- a/.github/workflows/assemble-test-lint.yml +++ b/.github/workflows/assemble-test-lint.yml @@ -73,7 +73,7 @@ jobs: run: ./gradlew :app:lintAmazonRelease - name: Upload lint reports - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 if: ${{ always() }} # also upload of lint errors with: name: Lint reports