diff --git a/android/app/build.gradle b/android/app/build.gradle index b5f2d00f..c6a8d0e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,24 +35,8 @@ apply plugin: 'com.google.gms.google-services' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" -configurations.all { - c -> - c.resolutionStrategy.eachDependency { - DependencyResolveDetails dependency -> - println dependency.requested.group - if (dependency.requested.group == 'org.bouncycastle') { - dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.68' - } - } -} - -//configurations.all { -// resolutionStrategy { -// force 'androidx.core:core-ktx:1.6.0' -// } -//} - android { + namespace = "com.ejada.hmg" compileSdkVersion 34 // ndkVersion "24.0.8215888" @@ -60,10 +44,26 @@ android { viewBinding true } + compileOptions { + coreLibraryDesugaringEnabled true + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + sourceSets { main.java.srcDirs += 'src/main/kotlin' } + kotlin { + jvmToolchain(17) + } + + + buildFeatures { + buildConfig = true + } + lintOptions { disable 'MissingTranslation' checkReleaseBuilds false @@ -71,10 +71,9 @@ android { defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.ejada.hmg" minSdkVersion 26 - targetSdkVersion 34 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName multiDexEnabled true @@ -128,12 +127,6 @@ android { pickFirst '**/*.so' } - - compileOptions { -// coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } } flutter { @@ -199,7 +192,8 @@ dependencies { implementation files('libs/Penguin.aar') implementation files('libs/PenguinRenderer.aar') - implementation "org.jetbrains.anko:anko-commons:0.10.4" +// implementation "org.jetbrains.anko:anko-commons:$anko_version" +// implementation "org.jetbrains.anko:anko-commons:0.10.4" implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0' implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android @@ -212,4 +206,6 @@ dependencies { implementation 'com.google.android.material:material:1.9.0' androidTestImplementation "androidx.test:core:1.4.0" + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' + } diff --git a/android/app/gradle/wrapper/gradle-wrapper.properties b/android/app/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a2c20300..00000000 --- a/android/app/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Sun Sep 20 09:53:06 EEST 2020 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip -#distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/android/app/local.properties b/android/app/local.properties index b29c63c9..7650242a 100644 --- a/android/app/local.properties +++ b/android/app/local.properties @@ -5,4 +5,4 @@ # For customization when using a Version Control System, please read the # header note. #Sun Sep 20 09:53:03 EEST 2020 -sdk.dir=/Users/erababah/Library/Android/sdk +sdk.dir=/Users/amir/Library/Android/sdk diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 58ac88b7..ed8b5ca3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -75,6 +75,7 @@ + > + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } + } + } rootProject.buildDir = '../build' @@ -83,10 +97,14 @@ subprojects { project.evaluationDependsOn(':app') } + + tasks.register("clean", Delete) { delete rootProject.buildDir } + + configurations.all { resolutionStrategy { force 'androidx.core:core-ktx:1.6.0' diff --git a/android/gradle.properties b/android/gradle.properties index cf554544..e21117a4 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,6 +2,7 @@ org.gradle.jvmargs=-Xmx4096m #android.enableR8=true android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true android.suppressUnsupportedCompileSdk=33 MAPBOX_USER_NAME = "mapbox" MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg" \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index f0c638fd..c5a661c9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 14 15:55:18 AST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14fb..265418ce 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,28 @@ -include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version '8.7.0' apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false + id "com.google.protobuf" version "0.9.1" apply false + } + +include ":app" diff --git a/lib/pages/conference/zoom/call_screen.dart b/lib/pages/conference/zoom/call_screen.dart index 2ba0e49e..74a87ad2 100644 --- a/lib/pages/conference/zoom/call_screen.dart +++ b/lib/pages/conference/zoom/call_screen.dart @@ -472,7 +472,7 @@ class _CallScreenState extends State { ], ), ); - if (errorType == Errors.SessionJoinFailed || errorType == Errors.SessionDisconncting) { + if (errorType == Errors.SessionJoinFailed || errorType == Errors.SessionDisconnecting) { Timer( const Duration(milliseconds: 1000), () => Navigator.pop(context), diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 05d90571..932a58c6 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -44,7 +44,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -// import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart'; +import 'package:flutter_app_icon_badge/flutter_app_icon_badge.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 02c894e1..e3117a3a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: A new Flutter application. version: 4.5.065+4050065 environment: - sdk: ">=3.0.0 <3.13.0" + sdk: " >=3.5.0 <4.0.0" dependencies: flutter: @@ -61,7 +61,7 @@ dependencies: shared_preferences: ^2.0.0 # flutter_flexible_toast: ^0.1.4 fluttertoast: ^8.0.8 - firebase_messaging: 14.1.0 + firebase_messaging: 14.7.10 firebase_analytics: ^10.0.5 # Progress bar flutter_progress_hud: ^2.0.2 @@ -154,7 +154,7 @@ dependencies: in_app_review: ^2.0.3 badges: ^3.1.2 -# flutter_app_icon_badge: ^2.0.0 + flutter_app_icon_badge: ^2.0.0 # dropdown_search: 5.0.6 youtube_player_flutter: ^9.1.0