From 428a2901f5a8893214f65d6c8e4d7706fee264d5 Mon Sep 17 00:00:00 2001 From: Nayan Date: Fri, 6 Oct 2023 15:04:04 +0530 Subject: [PATCH] Update Android code --- android/build.gradle | 6 +++--- example/.flutter-plugins-dependencies | 2 +- example/android/app/build.gradle | 4 ++-- example/android/build.gradle | 2 +- example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- example/ios/Flutter/flutter_export_environment.sh | 7 +++---- example/pubspec.yaml | 4 ++-- pubspec.yaml | 3 +-- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 02d4dbd..b70ad6d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,14 +2,14 @@ group 'uk.co.moodio.msal_flutter' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.4.31' + ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 3762054..a872c59 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/omar/Documents/GitHub/msal-flutter/","native_build":true,"dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/omar/Documents/GitHub/msal-flutter/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2022-08-10 09:42:20.983087","version":"3.0.5"} +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"msal_flutter","path":"/Users/nayan/Projects/External/msal-flutter/","native_build":true,"dependencies":[]}],"android":[{"name":"msal_flutter","path":"/Users/nayan/Projects/External/msal-flutter/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"msal_flutter","dependencies":[]}],"date_created":"2023-10-06 15:02:48.984907","version":"3.13.5"} \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index c042af4..bb3f904 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "uk.co.moodio.msal_flutter_example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index 65c89dc..5676968 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index e089df5..370bc20 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index 1203220..13db31b 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -1,13 +1,12 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/omar/Documents/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/omar/Documents/GitHub/msal-flutter/example" +export "FLUTTER_ROOT=/Users/nayan/fvm/versions/stable" +export "FLUTTER_APPLICATION_PATH=/Users/nayan/Projects/External/msal-flutter/example" export "COCOAPODS_PARALLEL_CODE_SIGN=true" -export "FLUTTER_TARGET=/Users/omar/Documents/GitHub/msal-flutter/example/lib/main.dart" +export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=2.0.0.2" export "FLUTTER_BUILD_NUMBER=2.0.0.2" -export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 22df955..4f99180 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.0.0-alpha.2 publish_to: 'none' environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: @@ -14,7 +14,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.6 dev_dependencies: flutter_test: diff --git a/pubspec.yaml b/pubspec.yaml index b54b5f6..b2c07cd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,8 +4,7 @@ version: 3.0.0-alpha1 homepage: https://github.com/muljin/msal-flutter repository: https://github.com/muljin/msal-flutter environment: - sdk: ">=2.17.0 <3.0.0" - flutter: ">=2.5.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: