Update build tools and dependencies

This commit is contained in:
Marvin W 2019-10-15 02:21:48 +02:00
parent 48f8bfa7a5
commit 15cd4491bc
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
5 changed files with 15 additions and 15 deletions

View File

@ -9,8 +9,6 @@ android:
components:
- tools
- platform-tools
- build-tools-25.0.2
- android-25
- build-tools-29.0.2
- android-29
- extra-android-m2repository
before_install:
- yes | sdkmanager "platforms;android-27"

View File

@ -1,5 +1,5 @@
/*
* Copyright 2013-2016 microG Project Team
* Copyright 2013-2019 microG Project Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -15,24 +15,27 @@
*/
buildscript {
ext.kotlin_version = '1.3.21'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "27.0.3"
ext.androidBuildVersionTools = "29.0.2"
ext.supportLibraryVersion = "28.0.0"
}
def androidCompileSdk() { return 27 }
def androidCompileSdk() { return 29 }
def androidTargetSdk() { return 27 }
def androidTargetSdk() { return 29 }
def androidMinSdk() { return 9 }

2
extern/GmsApi vendored

@ -1 +1 @@
Subproject commit 4c4277b75e843b759b0ff93dfb01c5e55cf41742
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6

View File

@ -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-4.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

View File

@ -22,7 +22,6 @@ import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v4.os.AsyncTaskCompat;
import android.util.Log;
import org.microg.gms.common.PublicApi;
@ -126,13 +125,13 @@ public abstract class GcmListenerService extends Service {
finishCounter();
GcmReceiver.completeWakefulIntent(intent);
} else if (ACTION_C2DM_RECEIVE.equals(intent.getAction())) {
AsyncTaskCompat.executeParallel(new AsyncTask<Void, Void, Void>() {
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... params) {
handleC2dmMessage(intent);
return null;
}
});
}.execute();
} else {
Log.w(TAG, "Unknown intent action: " + intent.getAction());
@ -192,4 +191,4 @@ public abstract class GcmListenerService extends Service {
}
}
}
}