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

Verified Commit 2a1ab70e authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Build fixes

parent ebc270c3

build.gradle

+3 −32
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
 */



buildscript {

    ext.cronetVersion = '91.0.4472.120.1'

    ext.nlpVersion = '2.0-alpha8'

    ext.cronetVersion = '102.5005.125'

    ext.nlpVersion = '2.0-alpha9'

    ext.safeParcelVersion = '1.7.0'

    ext.wearableVersion = '0.1.1'
@@ -14,6 +14,7 @@ buildscript { 


    ext.annotationVersion = '1.3.0'

    ext.appcompatVersion = '1.4.1'

    ext.biometricVersion = '1.1.0'

    ext.coreVersion = '1.7.0'

    ext.fragmentVersion = '1.4.0'

    ext.lifecycleVersion = '2.4.0'
@@ -70,17 +71,6 @@ def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2 + (gitCommitCo 
def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")

logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)



@Deprecated

String getMyVersionName() {

    return ourVersionName

}



@Deprecated

int getMyVersionCode() {

    return ourVersionCode

}





allprojects {

    apply plugin: 'idea'
@@ -90,25 +80,6 @@ allprojects { 
    ext.isReleaseVersion = false

}



@Deprecated

def androidCompileSdk() { return androidCompileSdk }



@Deprecated

def androidTargetSdk() { return androidTargetSdk }



@Deprecated

def androidMinSdk() { return androidMinSdk }



@Deprecated

def versionCode() {

    return ourVersionCode

}



@Deprecated

def versionName() {

    return ourVersionName

}



subprojects {

    repositories {

        jcenter()

gradle/publish-android.gradle

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ afterEvaluate { 
                            id = 'microg'

                            name = 'microG Team'

                        }

                        developer {

                            id = 'mar-v-in'

                            name = 'Marvin W.'

                        }

                    }

                    scm {

                        url = 'https://github.com/microg/GmsCore'

gradle/publish-java.gradle

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ afterEvaluate { 
                            id = 'microg'

                            name = 'microG Team'

                        }

                        developer {

                            id = 'mar-v-in'

                            name = 'Marvin W.'

                        }

                    }

                    scm {

                        url = 'https://github.com/microg/GmsCore'

play-services-appinvite-api/build.gradle

+4 −14
Original line number Diff line number Diff line
@@ -16,26 +16,16 @@ 


apply plugin: 'com.android.library'



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)

}



group = 'org.microg'

version = getMyVersionName()



android {

    compileSdkVersion androidCompileSdk()

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName getMyVersionName()

        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    compileOptions {

play-services-cast/build.gradle

+4 −13
Original line number Diff line number Diff line
@@ -5,23 +5,14 @@ 


apply plugin: 'com.android.library'



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)

}



android {

    compileSdkVersion androidCompileSdk()

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName getMyVersionName()

        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    compileOptions {