diff --git a/.github/renovate.json b/.github/renovate.json
new file mode 100644
index 0000000000..28aca37aff
--- /dev/null
+++ b/.github/renovate.json
@@ -0,0 +1,8 @@
+{
+ "labels": [
+ "dependencies"
+ ],
+ "extends": [
+ "config:base"
+ ]
+}
diff --git a/.github/workflows/build_debug_apk.yml b/.github/workflows/build_debug_apk.yml
index af5bcf27c7..9660bd4263 100644
--- a/.github/workflows/build_debug_apk.yml
+++ b/.github/workflows/build_debug_apk.yml
@@ -4,12 +4,26 @@ on:
workflow_dispatch:
push:
branches:
- - '*'
- - '*/*'
- - '**'
- - '!12.1-dev-localization'
- - '!12.1-alpha'
+ - '*-dev'
+ paths-ignore:
+ - '.idea/**'
+ - '.gitattributes'
+ - '.github/**.json'
+ - '.gitignore'
+ - '.gitmodules'
+ - '**.md'
+ - 'LICENSE'
+ - 'NOTICE'
pull_request:
+ paths-ignore:
+ - '.idea/**'
+ - '.gitattributes'
+ - '.github/**.json'
+ - '.gitignore'
+ - '.gitmodules'
+ - '**.md'
+ - 'LICENSE'
+ - 'NOTICE'
jobs:
build-debug-apk:
diff --git a/CompatLib/build.gradle b/CompatLib/build.gradle
index 538fe2b946..e5cbd2d26d 100644
--- a/CompatLib/build.gradle
+++ b/CompatLib/build.gradle
@@ -1,37 +1,8 @@
plugins {
id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
}
android {
- compileSdk COMPILE_SDK
namespace "app.lawnchair.compatlib"
-
- defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
addFrameworkJar('framework-12.jar')
}
-
-dependencies {
- implementation 'androidx.core:core-ktx:1.8.0'
-}
diff --git a/CompatLib/consumer-rules.pro b/CompatLib/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/CompatLib/proguard-rules.pro b/CompatLib/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/CompatLib/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/CompatLib/src/main/AndroidManifest.xml b/CompatLib/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/CompatLib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/CompatLibVR/build.gradle b/CompatLibVR/build.gradle
index 4bb83deadb..bd22fa1a02 100644
--- a/CompatLibVR/build.gradle
+++ b/CompatLibVR/build.gradle
@@ -1,38 +1,12 @@
plugins {
id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
}
android {
- compileSdk COMPILE_SDK
namespace "app.lawnchair.compatlib.eleven"
-
- defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
addFrameworkJar('framework-11.jar')
}
dependencies {
- implementation 'androidx.core:core-ktx:1.8.0'
- implementation project(':CompatLib')
+ implementation projects.compatLib
}
diff --git a/CompatLibVR/consumer-rules.pro b/CompatLibVR/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/CompatLibVR/proguard-rules.pro b/CompatLibVR/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/CompatLibVR/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/CompatLibVR/src/main/AndroidManifest.xml b/CompatLibVR/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/CompatLibVR/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/CompatLibVS/build.gradle b/CompatLibVS/build.gradle
index 8f0c1fc1bb..eef173a0c8 100644
--- a/CompatLibVS/build.gradle
+++ b/CompatLibVS/build.gradle
@@ -1,38 +1,12 @@
plugins {
id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
}
android {
- compileSdk COMPILE_SDK
namespace "app.lawnchair.compatlib.twelve"
-
- defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
addFrameworkJar('framework-12.jar')
}
dependencies {
- implementation 'androidx.core:core-ktx:1.8.0'
- implementation project(':CompatLib')
+ implementation projects.compatLib
}
diff --git a/CompatLibVS/consumer-rules.pro b/CompatLibVS/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/CompatLibVS/proguard-rules.pro b/CompatLibVS/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/CompatLibVS/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/CompatLibVS/src/main/AndroidManifest.xml b/CompatLibVS/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/CompatLibVS/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/SystemUIShared/AndroidManifest.xml b/SystemUIShared/AndroidManifest.xml
deleted file mode 100644
index aaadea6ec3..0000000000
--- a/SystemUIShared/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
diff --git a/SystemUIShared/build.gradle b/SystemUIShared/build.gradle
index c9f18d1ec0..e423e49bdc 100644
--- a/SystemUIShared/build.gradle
+++ b/SystemUIShared/build.gradle
@@ -1,14 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+ id 'com.android.library'
+ id 'kotlin-android'
+}
android {
- compileSdk COMPILE_SDK
-
- defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
- }
-
+ namespace "com.android.systemui.shared"
sourceSets {
main {
java.srcDirs = ['src']
@@ -17,24 +13,6 @@ android {
res.srcDirs = ['res']
}
}
-
- lint {
- abortOnError false
- }
-
- tasks.withType(JavaCompile) {
- options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
addFrameworkJar('framework-12l.jar')
}
@@ -43,8 +21,8 @@ dependencies {
implementation "androidx.concurrent:concurrent-futures:1.1.0"
implementation "androidx.lifecycle:lifecycle-common:2.5.1"
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
- implementation project(':CompatLib')
- implementation project(':CompatLibVR')
- implementation project(':CompatLibVS')
+ implementation projects.compatLib
+ implementation projects.compatLibVR
+ implementation projects.compatLibVS
implementation "org.json:json:20220320"
}
diff --git a/build.gradle b/build.gradle
index 1539a780b1..7602fb9b83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,38 +1,29 @@
-buildscript {
- ext {
- COMPILE_SDK = 33
- TARGET_SDK = 32
- MIN_SDK = 26
- kotlin_version = "1.7.10"
- compose_version = "1.2.1"
- compose_compiler_version = "1.3.0"
- accompanist_version = '0.25.1'
- libsu_version = '5.0.2'
- protocVersion = '3.21.5'
- room_version = '2.4.3'
- optoVersion = "1.0.15"
- }
- repositories {
- gradlePluginPortal()
- mavenCentral()
- google()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:7.2.2'
- classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.19'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
- classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
- classpath 'dev.rikka.tools.refine:gradle-plugin:3.1.1'
- classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.7.10-1.0.6"
- }
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+ id 'com.android.application' version "7.3.0-rc01"
+ id 'com.android.library' version "7.3.0-rc01" apply false
+ id 'org.jetbrains.kotlin.android' version "1.7.10"
+ id 'org.jetbrains.kotlin.plugin.parcelize' version "1.7.10"
+ id 'org.jetbrains.kotlin.plugin.serialization' version "1.7.10"
+ id "com.google.devtools.ksp" version "1.7.10-1.0.6"
+ id 'com.google.protobuf' version "0.8.19"
+ id 'com.google.android.gms.oss-licenses-plugin' version "0.10.5"
+ id 'dev.rikka.tools.refine' version "3.1.1"
}
allprojects {
- repositories {
- google()
- mavenCentral()
- maven { url 'https://jitpack.io' }
+ plugins.withId("com.android.library") {
+ setupAndroid(project)
+ }
+ plugins.withId("com.android.application") {
+ setupAndroid(project)
+ }
+
+ tasks.withType(KotlinCompile).configureEach {
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_1_8
+ }
}
ext.getFrameworkJar = { String name ->
@@ -49,7 +40,7 @@ allprojects {
tasks.withType(JavaCompile) {
options.bootstrapClasspath = files([frameworkJar] + (options.bootstrapClasspath.files as Iterable))
}
- tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+ tasks.withType(KotlinCompile) {
it.classpath.from(files([frameworkJar]))
}
}
@@ -58,7 +49,7 @@ allprojects {
ext.replaceFrameworkJar = { String name ->
def frameworkJar = getFrameworkJar(name)
gradle.projectsEvaluated {
- tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+ tasks.withType(KotlinCompile) {
def originalFiles = [] + it.classpath.files
def newFiles = []
originalFiles.each { file ->
@@ -81,20 +72,22 @@ allprojects {
}
tasks.matching {
- it.name.contains("collect*Dependencies") || it.name.contains("OssLicensesTask")
+ it.name.contains("OssLicensesTask")
}.configureEach {
notCompatibleWithConfigurationCache("https://github.com/google/play-services-plugins/issues/206")
}
}
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
-apply plugin: 'kotlin-parcelize'
-apply plugin: "com.google.devtools.ksp"
-apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
-apply plugin: 'dev.rikka.tools.refine'
+// todo remove ext block after migrating to version catalog
+ext {
+ compose_version = "1.2.1"
+ compose_compiler_version = "1.3.0"
+ accompanist_version = '0.25.1'
+ libsu_version = '5.0.2'
+ protocVersion = '3.21.5'
+ room_version = '2.4.3'
+ optoVersion = "1.0.15"
+}
final def commitHash = { ->
final def stdout = new ByteArrayOutputStream()
@@ -126,11 +119,7 @@ def quickstepMinSdk = "32"
def quickstepMaxSdk = "32"
android {
- compileSdk COMPILE_SDK
-
defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
versionCode 12_01_00_05
versionName "${versionDisplayName}"
buildConfigField "String", "VERSION_DISPLAY_NAME", "\"${versionDisplayName}\""
@@ -144,9 +133,6 @@ android {
buildConfigField "int", "QUICKSTEP_MIN_SDK", quickstepMinSdk
buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- vectorDrawables.useSupportLibrary = true
-
ksp { arg("room.schemaLocation", "$projectDir/schemas".toString()) }
}
@@ -156,10 +142,6 @@ android {
}
}
- lint {
- checkReleaseBuilds false
- }
-
buildFeatures {
compose true
}
@@ -194,15 +176,6 @@ android {
}
}
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
dependenciesInfo {
includeInApk = false
includeInBundle = false
@@ -323,32 +296,24 @@ android {
}
dependencies {
- final def FRAMEWORK_PREBUILTS_DIR = "prebuilts"
+ final def FRAMEWORK_PREBUILTS_DIR = "prebuilts/libs"
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.preference:preference-ktx:1.2.0"
- implementation project(':iconloaderlib')
- implementation project(':searchuilib')
- implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'SystemUI-statsd.jar')
+ implementation projects.iconloaderlib
+ implementation projects.searchuilib
+ implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd.jar')
// Recents lib dependency
- withQuickstepImplementation project(':SystemUIShared')
- withQuickstepCompileOnly project(':hidden-api')
- implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'WindowManager-Shell.jar')
+ withQuickstepImplementation projects.systemUIShared
+ withQuickstepCompileOnly projects.hiddenApi
+ implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell.jar')
// Required for AOSP to compile. This is already included in the sysui_shared.jar
- withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')
+ withoutQuickstepImplementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'plugin_core.jar')
- implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'org.mockito:mockito-core:4.6.1'
- androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
- androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test:rules:1.0.2'
- androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
- androidTestImplementation "androidx.annotation:annotation:1.4.0"
+ implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0'
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:3.1.1'
@@ -360,7 +325,6 @@ dependencies {
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.material3:material3:1.0.0-alpha14"
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
- implementation "androidx.compose.runtime:runtime-rxjava2:$compose_version"
implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.5.1"
@@ -378,7 +342,7 @@ dependencies {
implementation "com.google.android.material:material:1.6.1"
implementation "io.github.fornewid:material-motion-compose-core:0.9.0"
implementation 'dev.kdrag0n:colorkt:1.0.5'
- implementation 'io.coil-kt:coil-compose:2.1.0'
+ implementation 'io.coil-kt:coil-compose:2.2.0'
implementation 'me.xdrop:fuzzywuzzy:1.4.0'
implementation "com.patrykmichalik.opto:domain:$optoVersion"
implementation "com.patrykmichalik.opto:core:$optoVersion"
@@ -389,7 +353,6 @@ dependencies {
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
- implementation "androidx.room:room-rxjava2:$room_version"
ksp "androidx.room:room-compiler:$room_version"
implementation "com.github.topjohnwu.libsu:core:$libsu_version"
@@ -420,3 +383,35 @@ protobuf {
}
}
}
+
+def setupAndroid(Project project) {
+ project.android {
+ compileSdk 33
+ defaultConfig {
+ minSdk 26
+ targetSdk 32
+ vectorDrawables.useSupportLibrary = true
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ lint {
+ abortOnError true
+ checkReleaseBuilds false
+ }
+ }
+ project.dependencies {
+ implementation 'androidx.core:core-ktx:1.8.0'
+
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'org.mockito:mockito-core:4.6.1'
+ androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+ androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test:rules:1.0.2'
+ androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
+ androidTestImplementation "androidx.annotation:annotation:1.4.0"
+ }
+}
diff --git a/hidden-api/build.gradle b/hidden-api/build.gradle
index 8080952cfd..aaa1c910a0 100644
--- a/hidden-api/build.gradle
+++ b/hidden-api/build.gradle
@@ -1,33 +1,9 @@
plugins {
id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
}
android {
namespace 'app.lawnchair.hidden_api'
- compileSdk COMPILE_SDK
-
- defaultConfig {
- minSdk MIN_SDK
- targetSdk TARGET_SDK
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- }
}
dependencies {
diff --git a/hidden-api/consumer-rules.pro b/hidden-api/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/hidden-api/proguard-rules.pro b/hidden-api/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/hidden-api/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/hidden-api/src/main/AndroidManifest.xml b/hidden-api/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/hidden-api/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui
index 83e2a396c1..b634f78d6c 160000
--- a/platform_frameworks_libs_systemui
+++ b/platform_frameworks_libs_systemui
@@ -1 +1 @@
-Subproject commit 83e2a396c12e68e6d7a196b69e635aab26e86095
+Subproject commit b634f78d6c0189dd21a9709cd40933978ac417bf
diff --git a/settings.gradle b/settings.gradle
index e42cd7dd4c..5326a75a33 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,22 @@
+pluginManagement {
+ repositories {
+ gradlePluginPortal()
+ google()
+ mavenCentral()
+ }
+ resolutionStrategy {
+ eachPlugin {
+ // https://github.com/google/play-services-plugins/issues/223
+ if (requested.id.id == "com.google.android.gms.oss-licenses-plugin") {
+ useModule("com.google.android.gms:oss-licenses-plugin:${requested.version}")
+ }
+ }
+ }
+}
+
// https://docs.gradle.com/enterprise/gradle-plugin/
plugins {
- id "com.gradle.enterprise" version "3.10.3"
+ id "com.gradle.enterprise" version "3.11.1"
}
gradleEnterprise {
@@ -12,6 +28,17 @@ gradleEnterprise {
}
}
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ google()
+ mavenCentral()
+ maven { url 'https://jitpack.io' }
+ }
+}
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
include ':iconloaderlib'
project(':iconloaderlib').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/iconloaderlib')