From 2473174e43d9827a3a496135d65094fe043f34b7 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 16 Jul 2024 03:02:18 +0000 Subject: [PATCH 1/2] chore: update flutter/scripts/update-android.sh to 7.12.0 --- CHANGELOG.md | 8 ++++++++ flutter/android/build.gradle | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb91afe8b..5927932817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Android SDK from v7.11.0 to v7.12.0 ([#2173](https://github.com/getsentry/sentry-dart/pull/2173)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7120) + - [diff](https://github.com/getsentry/sentry-java/compare/7.11.0...7.12.0) + ## 8.4.0 ### Features diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle index 3242dddd64..cb54ba0adf 100644 --- a/flutter/android/build.gradle +++ b/flutter/android/build.gradle @@ -60,7 +60,7 @@ android { } dependencies { - api 'io.sentry:sentry-android:7.11.0' + api 'io.sentry:sentry-android:7.12.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" // Required -- JUnit 4 framework From a8a497b2b3ebc75fc22761d7450ff91c41bfba74 Mon Sep 17 00:00:00 2001 From: Ivan Dlugos Date: Tue, 16 Jul 2024 23:42:07 +0200 Subject: [PATCH 2/2] chore: update AGP and Kotlin --- CHANGELOG.md | 2 ++ flutter/android/build.gradle | 4 ++-- flutter/android/gradle.properties | 1 + flutter/example/android/build.gradle | 4 ++-- min_version_test/android/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5927932817..3914be06bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Bump Android SDK from v7.11.0 to v7.12.0 ([#2173](https://github.com/getsentry/sentry-dart/pull/2173)) - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7120) - [diff](https://github.com/getsentry/sentry-java/compare/7.11.0...7.12.0) + - updates AGP to v7.4.2 + - updates Kotlin to v1.8.0 ## 8.4.0 diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle index cb54ba0adf..d2d07645aa 100644 --- a/flutter/android/build.gradle +++ b/flutter/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/flutter/android/gradle.properties b/flutter/android/gradle.properties index 8bd86f6805..d9cf55df7c 100644 --- a/flutter/android/gradle.properties +++ b/flutter/android/gradle.properties @@ -1 +1,2 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle index 693111bbb3..741fa44529 100644 --- a/flutter/example/android/build.gradle +++ b/flutter/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.8.0' repositories { google() @@ -8,7 +8,7 @@ buildscript { dependencies { classpath 'io.sentry:sentry-android-gradle-plugin:4.5.0' - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'io.github.howardpang:androidNativeBundle:1.1.3' } diff --git a/min_version_test/android/build.gradle b/min_version_test/android/build.gradle index 70ef661422..e269d91443 100644 --- a/min_version_test/android/build.gradle +++ b/min_version_test/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }