diff --git a/android/app/build.gradle b/android/app/build.gradle index 26472fb6..8aa8b755 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,6 +38,10 @@ android { main.java.srcDirs += 'src/main/kotlin' } + lintOptions { + disable 'InvalidPackage' + } + defaultConfig { applicationId "chat.fluffy.fluffychat" minSdkVersion 21 diff --git a/android/build.gradle b/android/build.gradle index abd75862..a9bfc1e4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:3.5.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.2' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c9d0852..01a286e9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,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-5.6.2-all.zip diff --git a/pubspec.lock b/pubspec.lock index be3dcb89..e8ab3569 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -216,7 +216,7 @@ packages: description: path: "." ref: main - resolved-ref: "a6ee8053670ef4701e412bef0836480c4ad45905" + resolved-ref: a6ee8053670ef4701e412bef0836480c4ad45905 url: "https://gitlab.com/famedly/famedlysdk.git" source: git version: "0.0.1" @@ -624,7 +624,7 @@ packages: name: matrix_api_lite url: "https://pub.dartlang.org" source: hosted - version: "0.1.6" + version: "0.1.7" matrix_file_e2ee: dependency: transitive description: @@ -910,12 +910,10 @@ packages: receive_sharing_intent: dependency: "direct main" description: - path: "." - ref: "107ea4ae3c3da15be4e6d3337623b69cc2e04c68" - resolved-ref: "107ea4ae3c3da15be4e6d3337623b69cc2e04c68" - url: "https://github.com/radvansky-tomas/receive_sharing_intent.git" - source: git - version: "1.4.2" + name: receive_sharing_intent + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.3" rxdart: dependency: transitive description: @@ -1157,7 +1155,7 @@ packages: description: path: "." ref: main - resolved-ref: "7092bcc846f6f919c7dfb58f2c30bb45ca7231c0" + resolved-ref: "9ad5360bb63021f366d35facf217f053d465b46c" url: "https://github.com/UnifiedPush/flutter-connector.git" source: git version: "0.0.1" diff --git a/pubspec.yaml b/pubspec.yaml index 3258ff76..f78354e5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,6 @@ dependencies: ref: main unifiedpush: -# path: /home/sorunome/repos/gotify/flutter_unified_push git: url: https://github.com/UnifiedPush/flutter-connector.git ref: main @@ -41,11 +40,7 @@ dependencies: flutter_secure_storage: ^3.3.5 http: ^0.12.2 universal_html: ^1.2.4 - receive_sharing_intent: - # see https://github.com/KasemJaffer/receive_sharing_intent/pull/115 - git: - url: https://github.com/radvansky-tomas/receive_sharing_intent.git - ref: 107ea4ae3c3da15be4e6d3337623b69cc2e04c68 + receive_sharing_intent: ^1.4.3 flutter_slidable: ^0.5.7 flutter_sound_lite: ^7.5.3+1 open_file: ^3.0.3