diff --git a/.gitignore b/.gitignore index 14b7664..3c2e7fe 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ .vscode .idea /pubspec.yaml + +# FVM Version Cache +.fvm/ +.fvmrc diff --git a/packages/huawei_share/.metadata b/packages/huawei_share/.metadata index 8c825b0..b5dc4de 100644 --- a/packages/huawei_share/.metadata +++ b/packages/huawei_share/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4 - channel: stable + revision: "d8a9f9a52e5af486f80d932e838ee93861ffd863" + channel: "stable" project_type: plugin @@ -13,11 +13,11 @@ project_type: plugin migration: platforms: - platform: root - create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4 - base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4 + create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 + base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 - platform: android - create_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4 - base_revision: e99c9c7cd9f6c0b2f8ae6e3ebfd585239f5568f4 + create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 + base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863 # User provided section diff --git a/packages/huawei_share/CHANGELOG.md b/packages/huawei_share/CHANGELOG.md index 969c596..7820c7f 100644 --- a/packages/huawei_share/CHANGELOG.md +++ b/packages/huawei_share/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.0 + +* support Gradle 8, upgrade the minimum Dart version upgrade to 3.0 + ## 1.1.0 * support HiHonor Phone diff --git a/packages/huawei_share/android/build.gradle b/packages/huawei_share/android/build.gradle index fe15d4c..e46fc4a 100644 --- a/packages/huawei_share/android/build.gradle +++ b/packages/huawei_share/android/build.gradle @@ -1,16 +1,16 @@ -group 'com.transcodegroup.huawei_share' -version '1.0-SNAPSHOT' +group = "com.transcodegroup.huawei_share" +version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = "1.8.22" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath("com.android.tools.build:gradle:8.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } @@ -21,26 +21,29 @@ allprojects { } } -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +apply plugin: "com.android.library" +apply plugin: "kotlin-android" android { - compileSdkVersion 31 + namespace = "com.transcodegroup.huawei_share" + + compileSdk = 35 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = JavaVersion.VERSION_11 } sourceSets { - main.java.srcDirs += 'src/main/kotlin' + main.java.srcDirs += "src/main/kotlin" + test.java.srcDirs += "src/test/kotlin" } defaultConfig { - minSdkVersion 16 + minSdk = 21 } } diff --git a/packages/huawei_share/android/src/main/AndroidManifest.xml b/packages/huawei_share/android/src/main/AndroidManifest.xml index 962cff7..9ae5ab6 100644 --- a/packages/huawei_share/android/src/main/AndroidManifest.xml +++ b/packages/huawei_share/android/src/main/AndroidManifest.xml @@ -1,3 +1,12 @@ + package="com.transcodegroup.huawei_share"> + + + + + + + + + diff --git a/packages/huawei_share/example/.gitignore b/packages/huawei_share/example/.gitignore index 1da2d73..79c113f 100644 --- a/packages/huawei_share/example/.gitignore +++ b/packages/huawei_share/example/.gitignore @@ -5,16 +5,18 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related *.iml *.ipr *.iws -/.idea/ +.idea/ # The .vscode folder contains launch configuration and tasks you configure in # VS Code which you may wish to be included in version control, so this line @@ -27,7 +29,6 @@ migrate_working_dir/ .dart_tool/ .flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ diff --git a/packages/huawei_share/example/analysis_options.yaml b/packages/huawei_share/example/analysis_options.yaml index 61b6c4d..0d29021 100644 --- a/packages/huawei_share/example/analysis_options.yaml +++ b/packages/huawei_share/example/analysis_options.yaml @@ -13,8 +13,7 @@ linter: # The lint rules applied to this project can be customized in the # section below to disable rules from the `package:flutter_lints/flutter.yaml` # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. + # and their documentation is published at https://dart.dev/lints. # # Instead of disabling a lint rule for the entire project in the # section below, it can also be suppressed for a single line of code diff --git a/packages/huawei_share/example/android/.gitignore b/packages/huawei_share/example/android/.gitignore index cbe8999..8a80cb9 100644 --- a/packages/huawei_share/example/android/.gitignore +++ b/packages/huawei_share/example/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/packages/huawei_share/example/android/app/build.gradle b/packages/huawei_share/example/android/app/build.gradle index a314130..da64511 100644 --- a/packages/huawei_share/example/android/app/build.gradle +++ b/packages/huawei_share/example/android/app/build.gradle @@ -1,71 +1,44 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 33 // flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + namespace = "com.transcodegroup.huawei_share_example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + jvmTarget = JavaVersion.VERSION_1_8 } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.transcodegroup.huawei_share_example" + applicationId = "com.transcodegroup.huawei_share_example" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName } buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + source = "../.." } diff --git a/packages/huawei_share/example/android/app/src/debug/AndroidManifest.xml b/packages/huawei_share/example/android/app/src/debug/AndroidManifest.xml index 2701b6e..399f698 100644 --- a/packages/huawei_share/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/huawei_share/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/packages/huawei_share/example/android/app/src/profile/AndroidManifest.xml b/packages/huawei_share/example/android/app/src/profile/AndroidManifest.xml index 2701b6e..399f698 100644 --- a/packages/huawei_share/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/huawei_share/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +