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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump AGP to 7.2.1 and Gradle to 7.5.0 #363

Merged
merged 11 commits into from Aug 3, 2022
Merged

Bump AGP to 7.2.1 and Gradle to 7.5.0 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1bd3ed5
Bump AGP version and update build matrix
adinauer Aug 3, 2022
e123627
Bump gradle wrapper version
adinauer Aug 3, 2022
bd7fe32
Bump AGP and gradle version in test
adinauer Aug 3, 2022
722d721
CR
adinauer Aug 3, 2022
578bfb1
Try older alpha release for Java compatibility
adinauer Aug 3, 2022
a7fb879
Try alpha06 release for Java compatibility
adinauer Aug 3, 2022
f32b9a5
Try alpha05 release for Java compatibility
adinauer Aug 3, 2022
19800eb
Try alpha04 release for Java compatibility
adinauer Aug 3, 2022
793b9b3
Try alpha03 release for Java compatibility
adinauer Aug 3, 2022
33517c5
Add changelog
adinauer Aug 3, 2022
5c70769
Also set AGP version to 7.4.0-alpha3 for BaseSentryPluginTest
adinauer Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions .github/workflows/test-publish-dry-run.yaml
View file
Open in desktop
Expand Up @@ -20,24 +20,33 @@ jobs:
- agp: "7.0.4"
gradle: "7.2"
java: "11"
- agp: "7.1.2"
- agp: "7.1.3"
gradle: "7.2"
java: "11"
- agp: "7.1.2"
- agp: "7.1.3"
gradle: "7.3.3"
java: "11"
- agp: "7.1.2"
- agp: "7.1.3"
adinauer marked this conversation as resolved.
Show resolved Hide resolved
gradle: "7.4"
java: "11"
- agp: "7.2.0"
gradle: "7.4"
- agp: "7.1.3"
gradle: "7.5"
java: "11"
- agp: "7.3.0-beta01"
gradle: "7.4"
- agp: "7.2.1"
gradle: "7.3.3"
java: "11"
- agp: "7.4.0-alpha02"
- agp: "7.2.1"
gradle: "7.4"
java: "11"
- agp: "7.2.1"
gradle: "7.5"
java: "11"
- agp: "7.3.0-beta05"
gradle: "7.5"
java: "11"
- agp: "7.4.0-alpha03"
gradle: "7.5"
java: "11"

name: Publish Dry Run - AGP ${{ matrix.agp }} - Gradle ${{ matrix.gradle }}
env:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Features

- Bump AGP to 7.2.1 and Gradle to 7.5.0 ([#363](https://github.com/getsentry/sentry-android-gradle-plugin/pull/363))

## 3.1.3

### Features
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Dependencies.kt
View file
Open in desktop
@@ -1,5 +1,5 @@
object BuildPluginsVersion {
val AGP = System.getenv("VERSION_AGP") ?: "7.1.2"
val AGP = System.getenv("VERSION_AGP") ?: "7.2.1"
const val DOKKA = "1.5.31"
const val KOTLIN = "1.5.31"
const val KOTLIN_LANG_VERSION = "1.5"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
13 changes: 8 additions & 5 deletions plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt
View file
Open in desktop
Expand Up @@ -97,12 +97,15 @@ abstract class BaseSentryPluginTest(
arrayOf("7.0.4", "7.0.2"),
arrayOf("7.0.4", "7.1.1"),
arrayOf("7.0.4", "7.2"),
arrayOf("7.1.2", "7.2"),
arrayOf("7.1.2", "7.3.3"),
arrayOf("7.1.3", "7.2"),
arrayOf("7.1.3", "7.3.3"),
arrayOf("7.1.3", "7.4"),
arrayOf("7.2.0", "7.4"),
arrayOf("7.3.0-beta01", "7.4"),
arrayOf("7.4.0-alpha01", "7.4.2")
arrayOf("7.1.3", "7.5"),
arrayOf("7.2.1", "7.3.3"),
arrayOf("7.2.1", "7.4"),
arrayOf("7.2.1", "7.5"),
arrayOf("7.3.0-beta05", "7.5"),
arrayOf("7.4.0-alpha03", "7.5")
)

internal fun GradleRunner.appendArguments(vararg arguments: String) =
Expand Down
2 changes: 1 addition & 1 deletion plugin-build/src/test/kotlin/io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ import kotlin.test.assertTrue
import org.junit.Test

class SentryPluginWithFirebaseTest :
BaseSentryPluginTest(androidGradlePluginVersion = "7.1.2", gradleVersion = "7.4") {
BaseSentryPluginTest(androidGradlePluginVersion = "7.2.1", gradleVersion = "7.5") {

@Test
fun `does not break when there is a firebase-perf plugin applied`() {
Expand Down