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.

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

Jump to bottom

Update Android Gradle Plugin (patch) #489

Merged
merged 1 commit into from
May 17, 2023
Merged

Update Android Gradle Plugin (patch) #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,14 +542,14 @@ jobs:
- name: "AGP 8.1.x on Gradle 8.x"
gradle: '8.1.1'
gradle-java: '17'
agp: '8.1.0-beta02'
agp: '8.1.0-beta03'
kotlin: '1.6.21'
build-tools: '33.0.1'
test-task: 'testReport :quality:tests'
- name: "AGP 8.1.x on Gradle 8.x - plugin"
gradle: '8.1.1'
gradle-java: '17'
agp: '8.1.0-beta02'
agp: '8.1.0-beta03'
kotlin: '1.6.21'
build-tools: '33.0.2'
test-task: 'testReport :plugin:tests'
Expand Down Expand Up @@ -743,19 +743,19 @@ jobs:
name: 'AGP 8.0.x on Gradle 8.x - plugin (8.0.1 on 8.1.1) Test Results XMLs'
path: 'artifacts/AGP 8.0.x on Gradle 8.x - plugin (8.0.1 on 8.1.1) Test Results XMLs'

- name: "Download 'AGP 8.1.x on Gradle 8.x (8.1.0-beta02 on 8.1.1) Test Results XMLs' artifact."
- name: "Download 'AGP 8.1.x on Gradle 8.x (8.1.0-beta03 on 8.1.1) Test Results XMLs' artifact."
if: success() || failure()
uses: actions/download-artifact@v3
with:
name: 'AGP 8.1.x on Gradle 8.x (8.1.0-beta02 on 8.1.1) Test Results XMLs'
path: 'artifacts/AGP 8.1.x on Gradle 8.x (8.1.0-beta02 on 8.1.1) Test Results XMLs'
name: 'AGP 8.1.x on Gradle 8.x (8.1.0-beta03 on 8.1.1) Test Results XMLs'
path: 'artifacts/AGP 8.1.x on Gradle 8.x (8.1.0-beta03 on 8.1.1) Test Results XMLs'

- name: "Download 'AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta02 on 8.1.1) Test Results XMLs' artifact."
- name: "Download 'AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta03 on 8.1.1) Test Results XMLs' artifact."
if: success() || failure()
uses: actions/download-artifact@v3
with:
name: 'AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta02 on 8.1.1) Test Results XMLs'
path: 'artifacts/AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta02 on 8.1.1) Test Results XMLs'
name: 'AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta03 on 8.1.1) Test Results XMLs'
path: 'artifacts/AGP 8.1.x on Gradle 8.x - plugin (8.1.0-beta03 on 8.1.1) Test Results XMLs'

#- name: Display structure of downloaded files
# run: ls -R
Expand Down
2 changes: 1 addition & 1 deletion compat/agp-base/src/test/kotlin/net/twisterrob/gradle/common/AGPVersionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AGPVersionsTest {

@Test fun `CLASSPATH version is what the project is compiled with`() {
// This is not using AGPVersion() because Renovate needs to update this one. See "Update AGP version test.".
val expected = AGPVersion.parse("8.1.0-beta02")
val expected = AGPVersion.parse("8.1.0-beta03")

val actual = AGPVersions.CLASSPATH

Expand Down
2 changes: 1 addition & 1 deletion docs/debug/agp81-gradle81/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.android.application") version "8.1.0-beta02"
id("com.android.application") version "8.1.0-beta03"
}

android {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ net.twisterrob.test.java.io.tmpdir=

# Default test substitutions (overridden by .github/workflows/ci.yml with -P)
# AGP: 7.0.4, 7.1.3, 7.2.2, 7.3.1, 7.4.2, 8.0.0, 8.1.0
net.twisterrob.test.android.pluginVersion=8.1.0-beta02
net.twisterrob.test.android.pluginVersion=8.1.0-beta03
# Kotlin: AGP 7.0.4-7.2.2 -> Kotlin 1.4.32; AGP 7.3.0- -> Kotlin 1.6.21
net.twisterrob.test.kotlin.pluginVersion=1.6.21
# Gradle: 7.0.2, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.1, 8.0.2, 8.1
Expand Down
2 changes: 1 addition & 1 deletion gradle/agp.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ android-gradle-v72x = { module = "com.android.tools.build:gradle", version = "7.
android-gradle-v73x = { module = "com.android.tools.build:gradle", version = "7.3.1" }
android-gradle-v74x = { module = "com.android.tools.build:gradle", version = "7.4.2" }
android-gradle-v80x = { module = "com.android.tools.build:gradle", version = "8.0.1" }
android-gradle-v81x = { module = "com.android.tools.build:gradle", version = "8.1.0-beta02" }
android-gradle-v81x = { module = "com.android.tools.build:gradle", version = "8.1.0-beta03" }
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ gradle-publish = "1.2.0"

# See [lint] which is affected by this.
# Versions: https://maven.google.com/web/index.html#com.android.tools.build:gradle
agp = "8.1.0-beta02"
agp = "8.1.0-beta03"

# = 23.0.0 + [agp].
# @see com.android.build.gradle.internal.plugins.BasePlugin.createLintClasspathConfiguration
# @see builder-model//version.properties
# Versions: https://maven.google.com/web/index.html#com.android.tools.lint:lint
agp-tools = "31.1.0-beta02"
agp-tools = "31.1.0-beta03"

# Changelog: https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md
# Actual Kotlin version for dependencies. It has to be older to make sure a Gradle-compatible version is used.
Expand Down