From 47b9c1f893d5f4bc0093c60895bb55fa0eadb94f Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Fri, 14 May 2021 10:30:09 +0900 Subject: [PATCH] gradle and packages upgrade --- android/app/build.gradle | 4 +-- android/build.gradle | 17 ++-------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/utils/constants.dart | 4 +-- pubspec.lock | 32 +++++++++---------- 5 files changed, 24 insertions(+), 35 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index de11a53bb..5c95506ab 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,11 +105,11 @@ repositories { dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' - implementation 'androidx.core:core-ktx:1.5.0-rc01' // v1.5.0-alpha02+ for ShortcutManagerCompat.setDynamicShortcuts + implementation 'androidx.core:core-ktx:1.5.0-rc02' // v1.5.0-alpha02+ for ShortcutManagerCompat.setDynamicShortcuts implementation 'androidx.exifinterface:exifinterface:1.3.2' implementation "androidx.multidex:multidex:2.0.1" implementation 'com.commonsware.cwac:document:0.4.1' - implementation 'com.drewnoakes:metadata-extractor:2.15.0' + implementation 'com.drewnoakes:metadata-extractor:2.16.0' implementation 'com.github.deckerst:Android-TiffBitmapFactory:876e53870a' // forked, built by JitPack implementation 'com.github.bumptech.glide:glide:4.12.0' diff --git a/android/build.gradle b/android/build.gradle index ab25c38eb..728b18657 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,18 +4,13 @@ buildscript { repositories { google() mavenCentral() - // TODO TLAD remove jcenter (migrating to mavenCentral) when this is fixed: https://youtrack.jetbrains.com/issue/IDEA-261387 - jcenter { - content { - includeModule("org.jetbrains.trove4j", "trove4j") - } - } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // google-services:4.3.6 is broken, cf https://github.com/google/play-services-plugins/issues/176 classpath 'com.google.gms:google-services:4.3.5' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.0' } } @@ -23,12 +18,6 @@ allprojects { repositories { google() mavenCentral() - // TODO TLAD remove jcenter (migrating to mavenCentral) when this is fixed: https://youtrack.jetbrains.com/issue/IDEA-261387 - jcenter { - content { - includeModule("org.jetbrains.trove4j", "trove4j") - } - } } // gradle.projectsEvaluated { // tasks.withType(JavaCompile) { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index c10917bb8..6d2751c0c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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/lib/utils/constants.dart b/lib/utils/constants.dart index d341a3f28..b1f0676b6 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -249,8 +249,8 @@ class Constants { Dependency( name: 'Flutter Markdown', license: 'BSD 3-Clause', - licenseUrl: 'https://github.com/flutter/flutter_markdown/blob/master/LICENSE', - sourceUrl: 'https://github.com/flutter/flutter_markdown', + licenseUrl: 'https://github.com/flutter/packages/blob/master/packages/flutter_markdown/LICENSE', + sourceUrl: 'https://github.com/flutter/packages/tree/master/packages/flutter_markdown', ), Dependency( name: 'Flutter Staggered Animations', diff --git a/pubspec.lock b/pubspec.lock index c98c97eb5..2fedb79d7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -221,56 +221,56 @@ packages: name: firebase_analytics url: "https://pub.dartlang.org" source: hosted - version: "8.0.2" + version: "8.0.4" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.3.0+1" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.0.3" flutter: dependency: "direct main" description: flutter @@ -322,7 +322,7 @@ packages: name: flutter_markdown url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "0.6.2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -365,7 +365,7 @@ packages: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.1.3" github: dependency: "direct main" description: @@ -393,7 +393,7 @@ packages: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" google_maps_flutter_platform_interface: dependency: transitive description: @@ -414,7 +414,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.2" + version: "0.13.3" http_multi_server: dependency: transitive description: @@ -596,14 +596,14 @@ packages: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "0.5.0" + version: "0.5.1" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.1" path_provider_linux: dependency: transitive description: @@ -792,7 +792,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.1.4" shelf_packages_handler: dependency: transitive description: @@ -1035,7 +1035,7 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" webdriver: dependency: transitive description: