Skip to content
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.

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

fix(deps): update google.agp to v8.4.0 #622

Merged
merged 3 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ jobs:
- name: Run ${{ matrix.task }}
uses: gradle/actions/setup-gradle@v3
with:
build-root-directory: sample/android
gradle-version: ${{ matrix.gradle }}
arguments: ${{ matrix.task }} --stacktrace

- name: Run build in a subdirectory
working-directory: sample/android
run: gradle ${{ matrix.task }} --stacktrace

build-all-sample-kotlin-projects:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -125,6 +127,8 @@ jobs:
- name: Run ${{ matrix.task }}
uses: gradle/actions/setup-gradle@v3
with:
build-root-directory: sample/kotlin
gradle-version: ${{ matrix.gradle }}
arguments: ${{ matrix.task }} --stacktrace

- name: Run build in a subdirectory
working-directory: sample/kotlin
run: gradle ${{ matrix.task }} --stacktrace
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() {
// language=groovy
"""
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

dependencyResolutionManagement {
Expand Down Expand Up @@ -92,10 +92,10 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() {
def targetJavaVersion = JavaVersion.VERSION_11
android {
namespace "com.example.module2"
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 23
minSdkVersion 31
}
compileOptions {
sourceCompatibility = targetJavaVersion
Expand All @@ -106,10 +106,7 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() {
kotlin {
jvmToolchain(21)
}

tasks.withType(JavaCompile).configureEach {
options.release.set(targetJavaVersion.majorVersion.toInteger())
}

tasks.withType(KotlinCompile).configureEach {
compilerOptions.jvmTarget = [email protected](targetJavaVersion.toString())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ internal class CommonSettingsPluginTest : WithGradleProjectTest() {
javaVersion = JavaVersion.VERSION_11
javaFilesAllowed = false
androidPlugin {
compileSdkVersion = 30
minSdkVersion = 23
targetSdkVersion = 30
compileSdkVersion = 34
minSdkVersion = 31
targetSdkVersion = 34
}
qualityPlugin {
formatOnCompile = true
Expand All @@ -79,9 +79,9 @@ internal class CommonSettingsPluginTest : WithGradleProjectTest() {
javaVersion JavaVersion.VERSION_11
javaFilesAllowed false
androidPlugin {
compileSdkVersion 30
minSdkVersion 23
targetSdkVersion 30
compileSdkVersion 34
minSdkVersion 31
targetSdkVersion 34
}
qualityPlugin {
formatOnCompile true
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
java-compilation = "21"
google-agp = "8.3.2"
google-agp = "8.4.0"
gradle-starter = "0.71.0"
gradle-gradlepublish = "1.2.1"
gradle-jacocotestkit = "1.0.12"
Expand Down
12 changes: 7 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ pluginManagement {
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
id "com.gradle.enterprise" version "3.17.2"
id "com.gradle.develocity" version "3.17.2"
}

gradleEnterprise {
develocity {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
termsOfUseUrl = "https://gradle.com/terms-of-service"
termsOfUseAgree = "yes"

uploadInBackground = System.getenv("CI") == null
publishing.onlyIf { false }
}
}

Expand Down