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

Commit 6383566a authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Update gradle build 

 - Use new plugin definition API

 - Update SDK definitions

 - Remove androidx version reference

Bug: 238343180
Bug: 236188940
Test: studiow
Change-Id: Idbb3c67e465d4e815de86737a9f5f9a505b12004
Merged-In: Idbb3c67e465d4e815de86737a9f5f9a505b12004
parent 84fb31d2

iconloaderlib/build.gradle

+4 −15
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'



android {

    compileSdkVersion COMPILE_SDK

    buildToolsVersion BUILD_TOOLS_VERSION



    defaultConfig {

        minSdkVersion 26

        targetSdkVersion 28

plugins {

    id 'sysuigradleproject.android-library-conventions'

}



android {

    sourceSets {

        main {

            java.srcDirs = ['src', 'src_full_lib']
@@ -24,13 +18,8 @@ android { 
    tasks.withType(JavaCompile) {

        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

}



dependencies {

    implementation "androidx.core:core:${ANDROID_X_VERSION}"

    implementation "androidx.core:core"

}

searchuilib/build.gradle

+8 −6
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'

plugins {

    id 'com.android.library'

}



android {

    compileSdkVersion COMPILE_SDK

    buildToolsVersion BUILD_TOOLS_VERSION

    compileSdk TARGET_SDK.toInteger()

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        minSdkVersion 25

        targetSdkVersion 28

        minSdkVersion TARGET_SDK.toInteger()

        targetSdkVersion TARGET_SDK.toInteger()

    }



    sourceSets {
@@ -31,5 +33,5 @@ android { 
}



dependencies {

    implementation "androidx.core:core:${ANDROID_X_VERSION}"

    implementation "androidx.core:core:+"

}