Skip to content

Upgrade Gradle Build Tools, Update Gradle Wrapper, and Migrate JVM Toolchain to Java 17 #2784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Upgrade Gradle Build Tools, Update Gradle Wrapper, and Migrate JVM Toolchain to Java 17 #2784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2411720
Update Gradle and Kotlin configurations for datacapture and engine mo…
niccoreyes Feb 5, 2025
4782b25
Merge branch 'master' of https://github.com/google/android-fhir into …
niccoreyes Feb 5, 2025
065ca37
Remove duplicate engine dependency in build.gradle.kts
niccoreyes Feb 5, 2025
b05c018
workaround: just signed up for google cla for this commit
niccoreyes Feb 5, 2025
291ab62
workaround: removed comment post-cla registration
niccoreyes Feb 5, 2025
5d1b267
attempt: Upgrade build source Android Gradle plugin to version 8.5.0 …
niccoreyes Feb 5, 2025
4b5af1d
Add lifecycle coroutine support to MainActivity
niccoreyes Feb 5, 2025
b701837
Update Gradle wrapper and build configuration for datacapture module
niccoreyes Feb 5, 2025
1acb3d6
Update Gradle and JVM toolchain configuration as well for catalog
niccoreyes Feb 5, 2025
1222678
Revert gradlew files in codelabs/datacapture to state before b701837
niccoreyes Feb 5, 2025
0fc5a26
Changes made by ./gradlew spotlessApply
niccoreyes Feb 6, 2025
e80015d
Merge branch 'jvm-update-17' of https://github.com/niccoreyes/android…
niccoreyes Feb 6, 2025
6e19b3e
Merge branch 'master' into jvm-update-17
niccoreyes Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.22.0")

implementation("com.android.tools.build:gradle:8.5.0")
implementation("com.android.tools.build:gradle:8.7.3")

implementation("app.cash.licensee:licensee-gradle-plugin:1.8.0")
implementation("com.osacky.flank.gradle:fladle:0.17.4")
Expand Down
2 changes: 1 addition & 1 deletion catalog/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
listOf("META-INF/ASL2.0", "META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt"),
)
}
kotlin { jvmToolchain(11) }
kotlin { jvmToolchain(17) }
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion codelabs/datacapture/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
}

packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
kotlin { jvmToolchain(11) }
kotlin { jvmToolchain(17) }
}

dependencies {
Expand Down
4 changes: 3 additions & 1 deletion codelabs/datacapture/app/src/main/java/com/google/codelab/sdclibrary/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022-2024 Google LLC
* Copyright 2022-2025 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,6 +18,8 @@ package com.google.codelab.sdclibrary

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.launch

class MainActivity : AppCompatActivity() {

Expand Down
2 changes: 1 addition & 1 deletion codelabs/datacapture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.7.3")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")

// NOTE: Do not place your application dependencies here; they belong
Expand Down
Binary file modified codelabs/datacapture/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion codelabs/datacapture/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion codelabs/engine/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
}

packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
kotlin { jvmToolchain(11) }
kotlin { jvmToolchain(17) }
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion codelabs/engine/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.7.3")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion codelabs/engine/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists