Browse Source

update gradle

git@h5.yoqi.me 1 year ago
parent
commit
cb9bd979a8

+ 1 - 1
.devcontainer/Dockerfile

@@ -1 +1 @@
-FROM jianboy/flutter-dev-container:2.10.5
+FROM jianboy/flutter-dev-container:3.0.5

+ 2 - 2
.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/java-8
 {
-    "name": "Java 8",
+    "name": "Java 11",
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
@@ -22,7 +22,7 @@
         "java.configuration.runtimes": [
             {
                 "default": true,
-                "name": "JavaSE-1.8",
+                "name": "JavaSE-11",
                 "path": "/usr/local/sdkman/candidates/java/current"
             }
         ]

File diff suppressed because it is too large
+ 0 - 0
.flutter-plugins-dependencies


+ 3 - 3
.github/workflows/build.yml

@@ -17,18 +17,18 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: "8.x"
+          java-version: "11"
 
       - name: Setup gradle
         uses: eskatos/gradle-command-action@v1
         with:
-          gradle-version: 6.5
+          gradle-version: 7.3.3
 
       - name: Flutter action
         uses: subosito/flutter-action@v1.5.3
         with:
           channel: "stable"
-          flutter-version: "2.0.5"
+          flutter-version: "3.0.5"
       
       - name: Cache Dependencies
         id: cache

+ 2 - 2
android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     signingConfigs {
         release {
             storeFile file("../sign/release.jks")
@@ -54,7 +54,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "yoqi.me.flutternote"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 //        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

+ 3 - 1
android/app/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="flutter_note"
         android:icon="@mipmap/ic_launcher">
         <meta-data
@@ -40,5 +39,8 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

+ 1 - 1
android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

+ 1 - 1
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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

+ 13 - 0
ios/Flutter/flutter_export_environment.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/home/lyq/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/lyq/workspaces/flutter_note"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"

+ 8 - 8
pubspec.yaml

@@ -2,25 +2,25 @@ name: flutter_note
 description: Flutter 工作中不断总结.
 version: 1.0.0+1
 environment:
-  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+  sdk: ">=2.17.6 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  sqflite: ^1.1.5
+  sqflite: ^2.0.2+1
   shared_preferences: ^2.0.7
-  fluro: ^1.4.0
+  fluro: ^2.0.3
   cupertino_icons: ^1.0.3
   dio: ^4.0.0
-  flutter_easyrefresh: ^1.2.7
+  flutter_easyrefresh: ^2.2.2
   flutter_swiper: ^1.1.6
-  flutter_html: ^0.9.6
-  url_launcher: ^5.0.2
-  path_provider: ^0.5.0+1
+  flutter_html: ^2.2.1
+  url_launcher: ^6.1.5
+  path_provider: ^2.0.11
   provide: ^1.0.2
 #  jpush_flutter: ^0.0.11
 
-  fluttertoast: ^3.0.3
+  fluttertoast: ^8.0.9
   amap_base: ^0.3.5
 
   flutter_localizations: # 国际化

Some files were not shown because too many files changed in this diff