flutter-example: migrate legacy buildscript (#2644)

* migrate flutter android to use declarative plugins block * formatting * formatting
getsentry · Jan 29, 2025 · a24a1db · a24a1db
1 parent 9a0bac7
commit a24a1db
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 46 deletions.
diff --git a/flutter/example/android/app/CMakeLists.txt b/flutter/example/android/app/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 3.6)
 project(sentry-sample LANGUAGES C CXX)
 
+include("${CMAKE_CURRENT_SOURCE_DIR}/../../../sentry-native/sentry-native.cmake")
 add_library(native-sample SHARED src/main/cpp/native-sample.cpp)
 
 find_library(LOG_LIB log)
 
-include (${ANDROID_GRADLE_NATIVE_BUNDLE_PLUGIN_MK})
-
 target_link_libraries(
     native-sample PRIVATE
     ${LOG_LIB}
-    ${ANDROID_GRADLE_NATIVE_MODULES}
+    sentry_flutter_plugin # Use the alias defined in sentry-native.cmake
 )
diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle
@@ -1,3 +1,13 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+
+//    uncomment this to upload proguard mapping file and debug symbols to Sentry
+//    and also set the token (sentry.properties) file
+//    id "io.sentry.android.gradle"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +16,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,15 +26,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-apply plugin: 'com.ydq.android.gradle.native-aar.import'
-
-// uncomment this to upload proguard mapping file and debug symbols to Sentry
-// and also set the token (sentry.properties) file
-// apply plugin: 'io.sentry.android.gradle'
-
 android {
     namespace = "io.sentry.samples.flutter"
     compileOptions {
@@ -41,7 +37,7 @@ android {
         languageVersion = "1.4"
     }
 
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -50,7 +46,7 @@ android {
     defaultConfig {
         applicationId "io.sentry.samples.flutter"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
@@ -99,7 +95,6 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.annotation:annotation:1.1.0"
 }
 

diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle
@@ -1,19 +1,3 @@
-buildscript {
-    ext.kotlin_version = '2.0.21'
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'io.sentry:sentry-android-gradle-plugin:4.12.0'
-        classpath 'com.android.tools.build:gradle:8.3.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'io.github.howardpang:androidNativeBundle:1.1.5'
-    }
-}
-
 allprojects {
     repositories {
         google()

diff --git a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 16 15:46:36 CEST 2024
+#Wed Jan 29 14:45:29 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/flutter/example/android/settings.gradle b/flutter/example/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.2.2" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "io.sentry.android.gradle" version "4.14.1" apply false
+}
+
+include ":app"