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

Commit 27628875 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update Gradle, push unfinished GCM

parent 493d207a

build.gradle

+10 −1
Original line number Diff line number Diff line
@@ -15,7 +15,16 @@ 
 */



// Top-level build file where you can add configuration options common to all sub-projects/modules.

String getMyVersionName() {

    def stdout = new ByteArrayOutputStream()

    if (rootProject.file("gradlew").exists())

        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }

    else // automatic build system, don't tag dirty

        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }

    return stdout.toString().trim().substring(1)

}



subprojects {

    group = 'org.microg'

    version = '1.0-SNAPSHOT'

    version = getMyVersionName()

}

GmsApi @ 6aa11065

Compare f0ec7e60 to 6aa11065
Original line number Diff line number Diff line 
Subproject commit f0ec7e606f3e6e3a219eb87266c4dae1828b5083
 
Subproject commit 6aa110657beec0b3e6c26d1030943e0b97683335

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip

play-services-base/build.gradle

+8 −5
Original line number Diff line number Diff line
@@ -19,23 +19,26 @@ buildscript { 
        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:1.3.0'

        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'

        classpath 'com.android.tools.build:gradle:2.0.0'

    }

}



apply plugin: 'com.android.library'

apply plugin: 'com.github.dcendents.android-maven'



android {

    compileSdkVersion 23

    buildToolsVersion "23.0.1"

    buildToolsVersion "23.0.2"



    defaultConfig {

        versionName getMyVersionName()

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

    }

}



dependencies {

    compile 'com.android.support:support-v4:23.0.1'

    compile 'com.android.support:support-v4:23.3.0'

    compile project(':play-services-api')

}

play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.view.View; 


import com.google.android.gms.common.ConnectionResult;



import org.microg.gms.common.Constants;

import org.microg.gms.auth.AuthConstants;

import org.microg.gms.common.PublicApi;

import org.microg.gms.common.api.GoogleApiClientImpl;
@@ -422,7 +422,7 @@ public interface GoogleApiClient { 
         * Specify that the default account should be used when connecting to services.

         */

        public Builder useDefaultAccount() {

            this.accountName = Constants.DEFAULT_ACCOUNT;

            this.accountName = AuthConstants.DEFAULT_ACCOUNT;

            return this;

        }

    }