Merge branch 'main' into test/e2e

getsentry · Oct 17, 2024 · 431cfe6 · 431cfe6
2 parents 20c2d7e + 136c365
commit 431cfe6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-java@v4
         if: ${{ matrix.target == 'android' }}
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       # Install required dependencies for Flutter on Linux on Ubuntu

diff --git a/flutter/example/android/app/build.gradle b/flutter/example/android/app/build.gradle
@@ -31,6 +31,7 @@ apply plugin: 'com.ydq.android.gradle.native-aar.import'
 // apply plugin: 'io.sentry.android.gradle'
 
 android {
+    namespace = "io.sentry.samples.flutter"
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8

diff --git a/flutter/example/android/app/src/main/AndroidManifest.xml b/flutter/example/android/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:exported="true"
+            android:networkSecurityConfig="@xml/network">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

diff --git a/flutter/example/android/build.gradle b/flutter/example/android/build.gradle
@@ -7,8 +7,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.sentry:sentry-android-gradle-plugin:4.5.0'
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        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.3'
     }
@@ -26,7 +26,7 @@ subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

diff --git a/flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Oct 16 15:46:36 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/flutter/example/lib/isar/user.g.dart b/flutter/example/lib/isar/user.g.dart
diff --git a/flutter/example/lib/main.dart b/flutter/example/lib/main.dart
@@ -114,6 +114,9 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> {
   @override
   Widget build(BuildContext context) {
+    Future.delayed(const Duration(seconds: 3), () {
+      SentryFlutter.reportFullyDisplayed();
+    });
     return feedback.BetterFeedback(
       child: ChangeNotifierProvider<ThemeProvider>(
         create: (_) => ThemeProvider(),
@@ -231,7 +234,7 @@ class MainScaffold extends StatelessWidget {
               TooltipButton(
                 onPressed: isarTest,
                 text:
-                    'Executes CRUD operations on an in-memory with Isart and sends the created transaction to Sentry.',
+                    'Executes CRUD operations on an in-memory with Isar and sends the created transaction to Sentry.',
                 buttonTitle: 'isar',
               ),
             TooltipButton(

diff --git a/flutter/example/pubspec_overrides.yaml b/flutter/example/pubspec_overrides.yaml
@@ -17,3 +17,13 @@ dependency_overrides:
     path: ../../drift
   sentry_isar:
     path: ../../isar
+  # isar community fork is more stable
+  isar:
+    version: ^3.1.0
+    hosted: https://pub.isar-community.dev/
+  isar_flutter_libs:
+    version: ^3.1.0
+    hosted: https://pub.isar-community.dev/
+  isar_generator:
+    version: ^3.1.0
+    hosted: https://pub.isar-community.dev/