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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: sample app #2358

Merged
merged 12 commits into from
Oct 16, 2024
+24 −8
Merged

fix: sample app #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3900e3a
make spotlight work on android with network security config
buenaflor Oct 10, 2024
69a82ce
fix isar example error in prod build
buenaflor Oct 10, 2024
24d1fcc
add reporting of TTFD
buenaflor Oct 15, 2024
3639f8c
update
buenaflor Oct 15, 2024
026f7b4
Merge branch 'main' into fix/sample-app
denrase Oct 15, 2024
b3b6bfd
Update isar user
denrase Oct 15, 2024
22ebd4b
Merge branch 'main' into fix/sample-app
denrase Oct 15, 2024
1a35715
fix isar user scheme
denrase Oct 16, 2024
82f3541
update versions to work on android studio 2024.2.1
buenaflor Oct 16, 2024
c175d7d
update versions
buenaflor Oct 16, 2024
e5058d7
update java version in ci
buenaflor Oct 16, 2024
a0cc06f
update
buenaflor Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/flutter.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion flutter/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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/
Loading