Support Kotlin 1.9 plugins

kee-org · Aug 8, 2024 · dd3675f · dd3675f
1 parent 9859106
commit dd3675f
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 63 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "com.android.application"
-    id 'org.jetbrains.kotlin.android' // version '1.8.22'
+    id 'org.jetbrains.kotlin.android' version '1.9.25'
     id "dev.flutter.flutter-gradle-plugin"
 }
 
@@ -153,25 +153,8 @@ flutter {
 }
 
 dependencies {
-   // implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"
     implementation 'org.tinylog:tinylog-api:2.6.2'
     implementation 'org.tinylog:tinylog-impl:2.6.2'
     implementation 'org.tinylog:slf4j-tinylog:2.6.2'
     androidTestUtil "androidx.test:orchestrator:1.5.0"
-// Fix Duplicate class
- //   implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
-//    constraints {
-//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-//            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-//        }
-//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-//            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-//        }
-//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30") {
-//            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-//        }
-//        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") {
-//            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-//        }
-//    }
 }
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.5.1' apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
 }
 
 include ":app"
diff --git a/pubspec.lock b/pubspec.lock
@@ -69,9 +69,11 @@ packages:
   barcode_scan2:
     dependency: "direct main"
     description:
-      path: "../barcode_scan2"
-      relative: true
-    source: path
+      path: "."
+      ref: main
+      resolved-ref: "167eef78310ccb12507aa5dae41cd74fa2371cd1"
+      url: "https://github.com/kee-org/barcode_scan2"
+    source: git
     version: "4.3.3"
   base32:
     dependency: "direct main"
@@ -214,18 +216,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      sha256: "93429694c9253d2871b3af80cf11b3cbb5c65660d402ed7bf69854ce4a089f82"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.1.1"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   dio:
     dependency: "direct main"
     description:
@@ -622,11 +624,10 @@ packages:
   matomo_tracker:
     dependency: "direct main"
     description:
-      path: "."
-      ref: main
-      resolved-ref: "26a593661163ec5f95d3e915b0ff9621b8f5ada1"
-      url: "https://github.com/Floating-Dartists/matomo-tracker.git"
-    source: git
+      name: matomo_tracker
+      sha256: b7950a0d8e8a8533e451b54de8ab1005bd72af6a209e198a3b8cd58ff106ff46
+      url: "https://pub.dev"
+    source: hosted
     version: "5.0.0+1"
   meta:
     dependency: "direct main"
@@ -879,9 +880,11 @@ packages:
   rate_my_app:
     dependency: "direct main"
     description:
-      path: "../RateMyApp"
-      relative: true
-    source: path
+      path: "."
+      ref: api34
+      resolved-ref: "47a6d287b4925ab90de02777f3b44b8f13f36d22"
+      url: "https://github.com/kee-org/RateMyApp"
+    source: git
     version: "2.2.0"
   receive_intent:
     dependency: "direct main"
@@ -895,26 +898,27 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: api34
-      resolved-ref: a3e098c741ff6d77dcbe6f70a1ec16958a4168c3
+      ref: master
+      resolved-ref: "3ef06c3157b34ef011c3712a0605b9a19aa95977"
       url: "https://github.com/kee-org/sensitive_clipboard"
     source: git
     version: "1.0.0"
   share_plus:
     dependency: "direct main"
     description:
-      path: "../plus_plugins/packages/share_plus/share_plus"
-      relative: true
-    source: path
-    version: "9.0.0"
+      name: share_plus
+      sha256: "59dfd53f497340a0c3a81909b220cfdb9b8973a91055c4e5ab9b9b9ad7c513c0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4"
+      sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
   shared_preferences:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -86,15 +86,15 @@ dependencies:
 
   flutter_localizations:
     sdk: flutter
-  matomo_tracker:
-    git:
-      url: https://github.com/Floating-Dartists/matomo-tracker.git
-      ref: main
+  matomo_tracker: ^5.0.0
+    # git:
+    #   url: https://github.com/Floating-Dartists/matomo-tracker.git
+    #   ref: main
   file_picker: ^8.0.6
   zxcvbn: ^1.0.0
   flutter_rating_bar: ^4.0.1
   mime: ^1.0.5
-  share_plus: ^9.0.0
+  share_plus: ^10.0.0
   path: ^1.9.0 #flutter sdk always lags behind so upgrade this only when needed
   permission_handler: ^11.3.1
   flutter_file_dialog: ^3.0.2
@@ -112,23 +112,22 @@ dependencies:
     git:
       url: https://github.com/kee-org/flutter_inapp_purchase
       ref: main
-      #TODO:next: upgrade sensitive clipboard and use local dep override. verify then dissapperas from error list in KV2 and if so, repeat for all failing deps.
   sensitive_clipboard: 
     git:
       url: https://github.com/kee-org/sensitive_clipboard
-      ref: api34
+      ref: master
   #rate_my_app: ^2.2.0
   rate_my_app: 
     git:
       url: https://github.com/kee-org/RateMyApp
       ref: api34
   archive: ^3.6.1
-  device_info_plus: ^10.1.0
-  barcode_scan2: ^4.3.3
-  # barcode_scan2:
-  #   git:
-  #     url: https://github.com/kee-org/barcode_scan2
-  #     ref: main
+  device_info_plus: ^10.1.1
+  # barcode_scan2: ^4.3.3
+  barcode_scan2:
+    git:
+      url: https://github.com/kee-org/barcode_scan2
+      ref: main
 
 dev_dependencies:
   flutter_test:
@@ -140,14 +139,14 @@ dev_dependencies:
   #patrol: ^2.2.3
 
 dependency_overrides:
-  flutter_autofill_service:
-    path: ../flutter_autofill_service/
-  barcode_scan2:
-    path: ../barcode_scan2/
-  rate_my_app:
-    path: ../RateMyApp/
-  share_plus:
-    path: ../plus_plugins/packages/share_plus/share_plus/
+  # flutter_autofill_service:
+  #   path: ../flutter_autofill_service/
+  # barcode_scan2:
+  #   path: ../barcode_scan2/
+  # rate_my_app:
+  #   path: ../RateMyApp/
+  # share_plus:
+  #   path: ../plus_plugins/packages/share_plus/share_plus/
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec