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

Commit 42137837 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Updating gradle configuration 

Change-Id: I77c6ba057c751123bb40862a94a0027b7e0c87ef
parent 6aef85c4

AndroidManifest-common.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
<manifest

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

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>



    <!--

    The manifest defines the common entries that should be present in any derivative of Launcher3.

build.gradle

+34 −20
Original line number Diff line number Diff line 
buildscript {

    repositories {

        mavenCentral()

        jcenter()

        google()

    }

    dependencies {

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

        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'

        classpath 'com.android.tools.build:gradle:3.2.0-alpha12'

        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'

    }

}



final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'



apply plugin: 'com.android.application'

apply plugin: 'com.google.protobuf'
@@ -23,6 +25,7 @@ android { 
        versionName "1.0"



        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        vectorDrawables.useSupportLibrary = true

    }

    buildTypes {

        debug {
@@ -30,18 +33,28 @@ android { 
        }

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }



    flavorDimensions "default"



    productFlavors {

        aosp {

            dimension "default"

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

        }



        l3go {

            dimension "default"

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

        }



        quickstep {

            dimension "default"

            applicationId 'com.android.launcher3'

            testApplicationId 'com.android.launcher3.tests'

        }
@@ -98,27 +111,28 @@ android { 
}



repositories {

    maven { url "../../../prebuilts/fullsdk-darwin/extras/android/m2repository" }

    maven { url "../../../prebuilts/fullsdk-linux/extras/android/m2repository" }

    mavenCentral()

    jcenter()

    google()

}



final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT'

dependencies {

    compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"

    compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'



    quickstepCompile fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')



    testCompile 'junit:junit:4.12'

    androidTestCompile "org.mockito:mockito-core:1.9.5"

    androidTestCompile 'com.google.dexmaker:dexmaker:1.2'

    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'

    androidTestCompile 'com.android.support.test:runner:1.0.0'

    androidTestCompile 'com.android.support.test:rules:1.0.0'

    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

    androidTestCompile "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"

    implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"

    implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"

    implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'



    quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')



    testImplementation 'junit:junit:4.12'

    androidTestImplementation "org.mockito:mockito-core:1.9.5"

    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'

    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'

    androidTestImplementation 'com.android.support.test:runner:1.0.0'

    androidTestImplementation 'com.android.support.test:rules:1.0.0'

    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'

    androidTestImplementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}"

}



protobuf {

quickstep/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3" >



    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>



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

    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

tests/AndroidManifest-common.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.launcher3.tests">



    <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="21"/>



    <application android:debuggable="true">

        <uses-library android:name="android.test.runner" />