Aperture: Use org.lineageos:gradle-generatebp 1.4
Change-Id: I68e116ac1b0fa5a4ed8a6f1c6e4c2b9f9768e585
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 95e7e60..6c9b2d8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,7 +18,7 @@
buildscript {
repositories {
- maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.3/.m2")
+ maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.4/.m2")
}
dependencies {
@@ -124,6 +124,7 @@
}
module.group.startsWith("org.jetbrains") -> true
module.group == "com.google.auto.value" -> true
+ module.group == "com.google.errorprone" -> true
module.group == "com.google.guava" -> true
module.group == "junit" -> true
else -> false
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 3ba3aaa..9603f43 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -568,7 +568,7 @@
"androidx.transition_transition",
"androidx.vectordrawable_vectordrawable",
"androidx.viewpager2_viewpager2",
- "Aperture_com.google.errorprone_error_prone_annotations",
+ "error_prone_annotations",
],
}
@@ -597,32 +597,7 @@
"androidx.transition_transition",
"androidx.vectordrawable_vectordrawable",
"androidx.viewpager2_viewpager2",
- "Aperture_com.google.errorprone_error_prone_annotations",
- ],
- java_version: "1.7",
-}
-
-java_import {
- name: "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
- jars: ["com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar"],
- sdk_version: "33",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
-}
-
-java_library_static {
- name: "Aperture_com.google.errorprone_error_prone_annotations",
- sdk_version: "33",
- min_sdk_version: "14",
- apex_available: [
- "//apex_available:platform",
- "//apex_available:anyapex",
- ],
- static_libs: [
- "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
+ "error_prone_annotations",
],
java_version: "1.7",
}
diff --git a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar b/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
deleted file mode 100644
index ff3b59a..0000000
--- a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license b/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license
deleted file mode 100644
index c6127c5..0000000
--- a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2023 Google LLC
-
-SPDX-License-Identifier: Apache-2.0