From c7f286d5e70bbc3b6e6c2cb37e40e61ad8d466c1 Mon Sep 17 00:00:00 2001 From: milan Date: Mon, 12 Aug 2024 10:08:18 +0530 Subject: [PATCH] Fix #315 - update api level to 34 --- android/app/build.gradle | 22 ++++++++++++------- android/app/src/debug/AndroidManifest.xml | 3 +-- android/app/src/main/AndroidManifest.xml | 3 +-- android/build.gradle | 6 +++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/app/my_app.dart | 12 +++++----- pubspec.yaml | 22 +++++++++---------- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ff2d8ff..c2112e1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -62,17 +62,19 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 33 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' } + namespace "io.igrant.data4diabetes" + defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.igrant.data4diabetes" minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -101,6 +103,7 @@ android { buildFeatures { dataBinding = true + buildConfig = true } flavorDimensions "default" @@ -120,6 +123,7 @@ android { kotlinOptions { jvmTarget = '1.8' } + } flutter { @@ -128,13 +132,15 @@ flutter { } dependencies { + implementation fileTree(dir: "libs", include: ['*.jar','*.aar']) + implementation project(':libphonenumber_plugin') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0" - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' - implementation "com.github.L3-iGrant:data_wallet:2024.6.2" + implementation "com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.0" + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' +// implementation "com.github.L3-iGrant:data_wallet:2024.6.2" - implementation platform('com.google.firebase:firebase-bom:28.0.1') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-dynamic-links-ktx' // implementation 'com.github.L3-iGrant:mobileSDK-android:2.5.2' implementation 'com.github.decentralised-dataexchange:bb-consent-android-privacy-dashboard:2024.4.1' @@ -164,7 +170,7 @@ dependencies { annotationProcessor "org.greenrobot:eventbus-annotation-processor:3.1.1" implementation 'com.github.koushikcse:LoadingButton:1.7' implementation 'com.github.mediapark-pk:Base58-android:0.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' implementation 'com.tbuonomo:dotsindicator:4.2' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 9ff3f8a..f880684 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7fc5bb5..b9b8bb2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/build.gradle b/android/build.gradle index 4f5238a..e33ffb1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,16 +1,17 @@ buildscript { - ext.kotlin_version = '1.6.0' + ext.kotlin_version = '1.8.0' repositories { google() mavenCentral() jcenter() + maven { url 'https://storage.googleapis.com/download.flutter.io' } maven { url "https://jitpack.io" } maven { url 'https://repo.sovrin.org/repository/maven-public'} } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0' @@ -22,6 +23,7 @@ allprojects { google() mavenCentral() jcenter() + maven { url 'https://storage.googleapis.com/download.flutter.io' } maven { url "https://jitpack.io" } maven { url 'https://repo.sovrin.org/repository/maven-public'} maven { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e0226d2..4c9b8c9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Dec 12 12:34:09 BDT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/lib/app/my_app.dart b/lib/app/my_app.dart index c166368..74e3a44 100644 --- a/lib/app/my_app.dart +++ b/lib/app/my_app.dart @@ -85,11 +85,13 @@ class _MyAppState extends State { visualDensity: VisualDensity.adaptivePlatformDensity, brightness: Brightness.light, primaryColor: AppColors.colorPrimary, - textTheme: const TextTheme( - button: TextStyle( - color: Colors.white, - fontSize: 20.0, - fontWeight: FontWeight.bold, + textButtonTheme: TextButtonThemeData( + style: TextButton.styleFrom( + textStyle: const TextStyle( + color: Colors.white, + fontSize: 20.0, + fontWeight: FontWeight.bold, + ), ), ), fontFamily: 'Roboto', diff --git a/pubspec.yaml b/pubspec.yaml index 9cb5e4f..e0ed456 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,33 +11,33 @@ dependencies: flutter: sdk: flutter cupertino_icons: ^1.0.4 - get: ^4.5.1 + get: ^4.6.6 flutter_svg: ^0.22.0 dio: ^4.0.4 shared_preferences: ^2.0.10 flutter_localizations: sdk: flutter - intl: ^0.18.1 + intl: ^0.19.0 cached_network_image: ^3.2.0 animations: ^2.0.2 logger: ^1.1.0 pretty_dio_logger: ^1.1.1 font_awesome_flutter: ^9.2.0 - fluttertoast: ^8.0.8 + fluttertoast: ^8.2.6 d_chart: ^2.2.11 - flutter_screenutil: 5.7.0 - mobile_scanner: ^3.2.0 - package_info_plus: ^3.1.0 - intl_phone_number_input: ^0.7.3+1 - sms_autofill: ^2.3.0 + flutter_screenutil: 5.9.3 + mobile_scanner: ^5.1.1 + package_info_plus: ^7.0.0 + intl_phone_number_input: ^0.7.4 + sms_autofill: ^2.4.0 webview_flutter: ^4.4.2 http: ^0.13.6 page_view_dot_indicator: ^2.1.0 dropdown_button2: ^2.1.0 syncfusion_flutter_charts: ^21.2.4 - firebase_core: ^2.13.0 - firebase_core_platform_interface: 4.8.0 - firebase_crashlytics: ^3.3.1 + firebase_core: ^3.2.0 + firebase_core_platform_interface: 5.1.0 + firebase_crashlytics: ^4.0.3 uuid: ^3.0.7 dev_dependencies: