From c2a97b47163d597db317255d1cbde272f51c2d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferdinand=20M=C3=BCtsch?= Date: Wed, 17 Mar 2021 23:32:37 +0100 Subject: [PATCH] chore: dependency updates --- android/build.gradle | 11 +++++++++++ android/local.properties | 4 ++-- lib/services/api_service.dart | 8 ++++---- pubspec.yaml | 18 +++++++++--------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index bb8a303..a9f4c2a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,12 +17,23 @@ allprojects { } rootProject.buildDir = '../build' + subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { project.evaluationDependsOn(':app') } +subprojects { + project.configurations.all { + resolutionStrategy.eachDependency { details -> + if (details.requested.group == 'androidx.core' && + !details.requested.name.contains('androidx')) { + details.useVersion "1.3.1" + } + } + } +} task clean(type: Delete) { delete rootProject.buildDir diff --git a/android/local.properties b/android/local.properties index b0ca1f5..8a2bff5 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ sdk.dir=/opt/android/sdk flutter.sdk=/opt/flutter -flutter.versionName=1.2.0 +flutter.versionName=1.2.1 flutter.buildMode=release -flutter.versionCode=28 \ No newline at end of file +flutter.versionCode=29 \ No newline at end of file diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart index aa8bad2..d8c5009 100644 --- a/lib/services/api_service.dart +++ b/lib/services/api_service.dart @@ -24,19 +24,19 @@ abstract class ApiService { set safeOnUnauthorized(OnUnauthorized cb) => this._onUnauthorized = cb ?? this._onUnauthorized; Future head(String resourcePath) { - return http.head(_apiUrl + resourcePath, headers: _getHeaders()).then((res) => _checkUnauthorized(res)); + return http.head(Uri.parse(_apiUrl + resourcePath), headers: _getHeaders()).then((res) => _checkUnauthorized(res)); } Future get(String resourcePath) { - return http.get(_apiUrl + resourcePath, headers: _getHeaders()).then((res) => _checkUnauthorized(res)); + return http.get(Uri.parse(_apiUrl + resourcePath), headers: _getHeaders()).then((res) => _checkUnauthorized(res)); } Future post(String resourcePath, Map data) { - return http.post(_apiUrl + resourcePath, headers: _getHeaders(), body: json.encode(data)).then((res) => _checkUnauthorized(res)); + return http.post(Uri.parse(_apiUrl + resourcePath), headers: _getHeaders(), body: json.encode(data)).then((res) => _checkUnauthorized(res)); } Future delete(String resourcePath) { - return http.delete(_apiUrl + resourcePath, headers: _getHeaders()).then((res) => _checkUnauthorized(res)); + return http.delete(Uri.parse(_apiUrl + resourcePath), headers: _getHeaders()).then((res) => _checkUnauthorized(res)); } Map _getHeaders() { diff --git a/pubspec.yaml b/pubspec.yaml index 6aabed6..8ac7496 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: anchr_android description: Android client for Anchr.io link collections -version: 1.2.0+28 +version: 1.2.1+29 environment: sdk: ">=2.10.0 <3.0.0" @@ -10,21 +10,21 @@ dependencies: flutter: sdk: flutter cupertino_icons: ^1.0.0 - http: ^0.12.2 - url_launcher: ^5.7.8 + http: ^0.13.0 + url_launcher: ^6.0.2 flutter_svg: ^0.19.1 - shared_preferences: ^0.5.10 - sqflite: ^1.3.1+1 + shared_preferences: ^0.5.12+4 + sqflite: ^2.0.0+3 fluttertoast: ^7.0.2 - package_info: ^0.4.3 + package_info: ^2.0.0 f_logs: ^1.2.2 - device_info: ^1.0.0 - share: 0.6.5+4 + device_info: ^2.0.0 + share: 2.0.1 dev_dependencies: flutter_test: sdk: flutter - flutter_launcher_icons: ^0.7.0 + flutter_launcher_icons: ^0.8.1 flutter: uses-material-design: true