Skip to content

Commit

Permalink
fix: sample app (#2358)
Browse files Browse the repository at this point in the history
* make spotlight work on android with network security config

* fix isar example error in prod build

* add reporting of TTFD

* update

* Update isar user

* fix isar user scheme

* update versions to work on android studio 2024.2.1

* update versions

* update java version in ci

* update

---------

Co-authored-by: Denis Andrasec <denrase@gmail.com>
  • Loading branch information
buenaflor and denrase authored Oct 16, 2024
1 parent 94757e3 commit 136c365
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions flutter/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion flutter/example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions flutter/example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -26,7 +26,7 @@ subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
project.evaluationDependsOn(":app")
}

tasks.register("clean", Delete) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion flutter/example/lib/isar/user.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion flutter/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(
Expand Down
10 changes: 10 additions & 0 deletions flutter/example/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/

0 comments on commit 136c365

Please sign in to comment.