From 5fd704c956b0b7bbda6baee56fbfaf0ebcd288b8 Mon Sep 17 00:00:00 2001 From: Hpsaturn Date: Tue, 14 Jun 2022 10:37:57 +0200 Subject: [PATCH 1/2] updated gradle dependencies and fix issue with kotlin library --- .gitignore | 50 +++++++++++++++++++ native_opencv/android/build.gradle | 4 +- native_opencv/example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native_opencv/example/pubspec.lock | 28 +++++------ opencv_app/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- opencv_app/pubspec.lock | 30 +++++------ 8 files changed, 85 insertions(+), 35 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a1c2a50 --- /dev/null +++ b/.gitignore @@ -0,0 +1,50 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.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 +# is commented out by default. +.vscode/ +.classpath +.project +.settings/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/native_opencv/android/build.gradle b/native_opencv/android/build.gradle index 751ea9e..84ad161 100644 --- a/native_opencv/android/build.gradle +++ b/native_opencv/android/build.gradle @@ -2,14 +2,14 @@ group 'com.valyouw.native_opencv' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/native_opencv/example/android/build.gradle b/native_opencv/example/android/build.gradle index 6b57dfa..c4ee63c 100644 --- a/native_opencv/example/android/build.gradle +++ b/native_opencv/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/native_opencv/example/android/gradle/wrapper/gradle-wrapper.properties b/native_opencv/example/android/gradle/wrapper/gradle-wrapper.properties index 571984a..b9f4649 100644 --- a/native_opencv/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/native_opencv/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.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/native_opencv/example/pubspec.lock b/native_opencv/example/pubspec.lock index eab5b6a..832be94 100644 --- a/native_opencv/example/pubspec.lock +++ b/native_opencv/example/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -95,6 +95,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: @@ -115,7 +122,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sky_engine: dependency: transitive description: flutter @@ -127,7 +134,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -162,21 +169,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.15.1 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.5.0" diff --git a/opencv_app/android/build.gradle b/opencv_app/android/build.gradle index 6b57dfa..c4ee63c 100644 --- a/opencv_app/android/build.gradle +++ b/opencv_app/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.7.0' repositories { google() mavenCentral() diff --git a/opencv_app/android/gradle/wrapper/gradle-wrapper.properties b/opencv_app/android/gradle/wrapper/gradle-wrapper.properties index 571984a..b9f4649 100644 --- a/opencv_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/opencv_app/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.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/opencv_app/pubspec.lock b/opencv_app/pubspec.lock index 9c14d5f..c270b89 100644 --- a/opencv_app/pubspec.lock +++ b/opencv_app/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cross_file: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -120,7 +120,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" lints: dependency: transitive description: @@ -135,6 +135,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: @@ -155,7 +162,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" pedantic: dependency: transitive description: @@ -188,7 +195,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -230,21 +237,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.15.1 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.5.0" From 0a952eb732d9549e857c1e57e8a439bd03c2883e Mon Sep 17 00:00:00 2001 From: Hpsaturn Date: Fri, 17 Jun 2022 21:59:31 +0200 Subject: [PATCH 2/2] remove unnecesary .gitignore file --- .gitignore | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a1c2a50..0000000 --- a/.gitignore +++ /dev/null @@ -1,50 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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 -# is commented out by default. -.vscode/ -.classpath -.project -.settings/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release