Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 15cd4491 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update build tools and dependencies

parent 48f8bfa7

.travis.yml

+2 −4
Original line number Diff line number Diff line
@@ -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"

build.gradle

+8 −5
Original line number Diff line number Diff line 
/*

 * 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 }

GmsApi @ 2a43448e

Compare 4c4277b7 to 2a43448e
Original line number Diff line number Diff line 
Subproject commit 4c4277b75e843b759b0ff93dfb01c5e55cf41742
 
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -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

play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java

+3 −4
Original line number Diff line number Diff line
@@ -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());