Skip to content

Commit 3f9c3f4

Browse files
authored
Merge pull request #152 from akaMrNagar/dev
Bumped up flutter, Gradle, AGP and Native libraries
2 parents 73a6073 + 28fb357 commit 3f9c3f4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+9648
-4699
lines changed

android/app/build.gradle

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ android {
2626

2727
namespace "com.mindful.android"
2828
compileSdkVersion flutter.compileSdkVersion
29-
ndkVersion flutter.ndkVersion
29+
ndkVersion '27.0.12077973'
3030

3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
34+
}
35+
36+
kotlinOptions {
37+
jvmTarget = "17"
3438
}
3539

3640
defaultConfig {
3741
// You can update the following values to match your application needs.
3842
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
3943
applicationId "com.mindful.android"
4044
minSdkVersion defaultMinSdkVersion
41-
compileSdk 34
4245
targetSdkVersion flutter.targetSdkVersion
4346
versionCode flutterVersionCode.toInteger()
4447
versionName flutterVersionName
@@ -63,7 +66,7 @@ android {
6366
}
6467
resValue "string", "app_name", "Mindful"
6568
signingConfig signingConfigs.release
66-
69+
6770
// If you see "SigningConfig 'release' is missing required property 'storeFile'",
6871
// it means your release keystore is not set up due to missing environment variables.
6972
// To fix this locally, either:
@@ -83,7 +86,8 @@ android {
8386
}
8487

8588
profile {
86-
applicationIdSuffix ".profile"
89+
// app_links library is causing error so commenting it out
90+
// applicationIdSuffix ".profile"
8791
resValue "string", "app_name", "Mindful Profile"
8892
signingConfig System.getenv("KEYSTORE_FILE") != null ? signingConfigs.release : signingConfigs.debug
8993
}
@@ -98,7 +102,7 @@ flutter {
98102
}
99103

100104
dependencies {
101-
implementation 'androidx.work:work-runtime:2.9.0'
102-
implementation 'androidx.appcompat:appcompat:1.6.1'
105+
implementation 'androidx.work:work-runtime:2.10.1'
106+
implementation 'androidx.appcompat:appcompat:1.7.1'
103107
}
104108

android/app/src/main/java/com/mindful/android/widgets/DeviceUsageWidget.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class DeviceUsageWidget : AppWidgetProvider() {
215215
for (app in deviceApps) {
216216
// Only include apps which are launchable
217217
if (packageManager.getLaunchIntentForPackage(app.packageName) != null) {
218-
val appUid = app.applicationInfo.uid
218+
val appUid = app.applicationInfo?.uid
219219
mobileUsageKbs = mobileUsageKbs + mobileUsageOneDay.getOrDefault(appUid, 0L)
220220
wifiUsageKbs = wifiUsageKbs + wifiUsageOneDay.getOrDefault(appUid, 0L)
221221

android/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ allprojects {
1111

1212
rootProject.buildDir = '../build'
1313
subprojects {
14-
// fix for verifyReleaseResources
15-
// ============
16-
afterEvaluate { project ->
17-
if (project.plugins.hasPlugin("com.android.application") ||
18-
project.plugins.hasPlugin("com.android.library")) {
19-
project.android {
20-
compileSdkVersion 34
21-
buildToolsVersion "34.0.0"
22-
}
23-
}
24-
}
25-
// ============
2614
project.buildDir = "${rootProject.buildDir}/${project.name}"
2715
}
2816
subprojects {

0 commit comments

Comments
 (0)