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

Commit 84e8062d authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

studiow: fix udc-dev build 

 - Upgrade to Java 17

 - Upgrade to AGP 8

 - Remove convention plugin, use "afterEvaluate" for global settings
   instead

 - Add namespaces to gradle projects

Test: studiow
Bug: 236188940

Change-Id: I33e25e51ef2e26cecdedb086b663f93bfef50494
parent 49c0bbac

iconloaderlib/build.gradle

+3 −3
Original line number Diff line number Diff line 
plugins {

    id 'sysuigradleproject.android-library-conventions'

    id 'com.android.library'

}



android {

    namespace = "com.android.launcher3.icons"

    sourceSets {

        main {

            java.srcDirs = ['src', 'src_full_lib']
@@ -10,8 +11,7 @@ android { 
            res.srcDirs = ['res']

        }

    }



    lintOptions {

    lint {

        abortOnError false

    }

motiontoollib/build.gradle

+5 −12
Original line number Diff line number Diff line 
plugins {

    id 'sysuigradleproject.android-library-conventions'

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}
@@ -7,18 +7,11 @@ plugins { 
final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/motiontoollib/src/com/android/app/motiontool/proto"



android {

    compileSdk TARGET_SDK.toInteger()

    buildToolsVersion = BUILD_TOOLS_VERSION



    namespace = "com.android.app.motiontool"

    defaultConfig {

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }



    defaultConfig {

        minSdkVersion TARGET_SDK.toInteger()

        targetSdkVersion TARGET_SDK.toInteger()

    }



    sourceSets {

        main {

            java.srcDirs = ['src']
@@ -30,15 +23,15 @@ android { 
            manifest.srcFile "tests/AndroidManifest.xml"

        }

    }



    lintOptions {

    lint {

        abortOnError false

    }



}



dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_version}"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    api project(":ViewCaptureLib")

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

searchuilib/build.gradle

+3 −14
Original line number Diff line number Diff line
@@ -3,13 +3,7 @@ plugins { 
}



android {

    compileSdk TARGET_SDK.toInteger()

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        minSdkVersion TARGET_SDK.toInteger()

        targetSdkVersion TARGET_SDK.toInteger()

    }

    namespace = "com.android.app.search"



    sourceSets {

        main {
@@ -18,17 +12,12 @@ android { 
        }

    }



    lintOptions {

        abortOnError false

    }



    tasks.withType(JavaCompile) {

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

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    lint {

        abortOnError false

    }

}

viewcapturelib/build.gradle

+5 −9
Original line number Diff line number Diff line 
plugins {

    id 'sysuigradleproject.android-library-conventions'

    id 'com.android.library'

    id 'org.jetbrains.kotlin.android'

    id 'com.google.protobuf'

}
@@ -7,12 +7,8 @@ plugins { 
final String PROTOS_DIR = "${ANDROID_TOP}/frameworks/libs/systemui/viewcapturelib/src/com/android/app/viewcapture/proto"



android {

    compileSdk TARGET_SDK.toInteger()

    buildToolsVersion = BUILD_TOOLS_VERSION



    namespace = "com.android.app.viewcapture"

    defaultConfig {

        minSdkVersion TARGET_SDK.toInteger()

        targetSdkVersion TARGET_SDK.toInteger()

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }
@@ -27,15 +23,15 @@ android { 
            manifest.srcFile "tests/AndroidManifest.xml"

        }

    }



    lintOptions {

    lint {

        abortOnError false

    }



}



dependencies {

    implementation "androidx.core:core:1.9.0"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_version}"

    implementation "com.google.protobuf:protobuf-lite:${protobuf_lite_version}"

    androidTestImplementation project(':SharedTestLib')

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation "androidx.test:rules:1.4.0"