Skip to content

Commit

Permalink
chore: dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
muety committed Mar 17, 2021
1 parent 341f71f commit c2a97b4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
11 changes: 11 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/local.properties
Original file line number Diff line number Diff line change
@@ -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
flutter.versionCode=29
8 changes: 4 additions & 4 deletions lib/services/api_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ abstract class ApiService {
set safeOnUnauthorized(OnUnauthorized cb) => this._onUnauthorized = cb ?? this._onUnauthorized;

Future<http.Response> 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<http.Response> 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<http.Response> post(String resourcePath, Map<String, dynamic> 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<http.Response> 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<String, String> _getHeaders() {
Expand Down
18 changes: 9 additions & 9 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down

0 comments on commit c2a97b4

Please sign in to comment.