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

Unverified Commit 982d10f0 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Upgrade gradle

parent 9b5d774b

build.gradle

+15 −14
Original line number Diff line number Diff line
@@ -5,25 +5,14 @@ 


buildscript {

    repositories {

        jcenter()

        mavenCentral()

        google()

    }

    dependencies {

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

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

    }

}



allprojects {

    apply plugin: 'idea'

    ext.androidBuildVersionTools = "29.0.3"

}



def androidCompileSdk() { return 30 }



def androidTargetSdk() { return 24 }



def androidMinSdk() { return 9 }



def versionCode() {

    def stdout = new ByteArrayOutputStream()

    exec { commandLine 'git', 'rev-list', '--count', "HEAD"; standardOutput = stdout }
@@ -39,10 +28,22 @@ def versionName() { 
    return stdout.toString().trim().substring(1)

}



allprojects {

    apply plugin: 'idea'

    version = versionName()



    ext.androidBuildVersionTools = "30.0.3"



    ext.appVersionCode = versionCode()

    ext.androidCompileSdk = 30

    ext.androidTargetSdk = 24

    ext.androidMinSdk = 9

}



subprojects {

    group = 'org.microg'

    repositories {

        jcenter()

        mavenCentral()

        google()

    }

}

fake-store/build.gradle

+10 −5
Original line number Diff line number Diff line
@@ -35,14 +35,19 @@ int getMyVersionCode() { 
}



android {

    compileSdkVersion androidCompileSdk()

    namespace "com.android.vending"

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName getMyVersionName()

        versionCode getMyVersionCode()

        minSdkVersion androidMinSdk()

        targetSdkVersion androidTargetSdk()

        versionName version

        versionCode appVersionCode

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    buildFeatures {

        aidl = true

    }



    compileOptions {

fake-store/src/main/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
  ~ limitations under the License.

  -->



<manifest package="com.android.vending"

          xmlns:android="http://schemas.android.com/apk/res/android">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">



    <permission android:name="com.android.vending.CHECK_LICENSE" android:protectionLevel="normal"/>

    <uses-permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE"/>

gradle/wrapper/gradle-wrapper.jar

+3.09 KiB (60.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+3 −2
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2015 microG Project Team

# SPDX-FileCopyrightText: 2015, microG Project Team

# SPDX-License-Identifier: CC0-1.0



distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip

networkTimeout=10000

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists