Merge branch 'lineage-21.0' of gitlab.e.foundation:e/os/android_packages_apps_Eleven into a14 (df09c2c3) · Commits · e / os / android_packages_apps_Eleven

.github/workflows/build.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ jobs:

		steps:
		- name: Checkout repo
		uses: actions/checkout@v3
		uses: actions/checkout@v4

		- name: Build
		uses: ./.github/workflows/build

.github/workflows/build/action.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ runs:

		steps:
		- name: Setup JDK 17
		uses: actions/setup-java@v3
		uses: actions/setup-java@v4
		with:
		distribution: 'zulu'
		java-version: 17
		@@ -24,7 +24,7 @@ runs:
		exit -1
		fi

		- uses: actions/upload-artifact@v3
		- uses: actions/upload-artifact@v4
		with:
		name: Eleven-debug.apk
		path: build/outputs/apk/debug/Eleven-debug.apk

Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,12 +29,13 @@ android_app {
		// DO NOT EDIT THIS SECTION MANUALLY
		"androidx.appcompat_appcompat",
		"androidx.cardview_cardview",
		"androidx-constraintlayout_constraintlayout",
		"androidx.legacy_legacy-support-v4",
		"androidx.palette_palette",
		"androidx.preference_preference",
		"androidx.recyclerview_recyclerview",
		"androidx-constraintlayout_constraintlayout",
		"Eleven_com.google.android.material_material",
		"kotlin-stdlib-jdk8",
		"elib",
		],

build.gradle.kts

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ apply {

		buildscript {
		repositories {
		maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.4/.m2")
		maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.17/.m2")
		}

		dependencies {
		@@ -103,6 +103,7 @@ dependencies {

		configure<GenerateBpPluginExtension> {
		targetSdk.set(android.defaultConfig.targetSdk!!)
		minSdk.set(android.defaultConfig.minSdk!!)
		availableInAOSP.set { module: Module ->
		when {
		module.group.startsWith("androidx") -> true

libs/Android.bp

+7 −8

Original line number	Diff line number	Diff line
		//
		// SPDX-FileCopyrightText: 2024 The LineageOS Project
		// SPDX-FileCopyrightText: The LineageOS Project
		// SPDX-License-Identifier: Apache-2.0
		//

		@@ -9,21 +9,21 @@ android_library_import {
		name: "Eleven_com.google.android.material_material-nodeps",
		aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"],
		sdk_version: "34",
		min_sdk_version: "14",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"//apex_available:anyapex",
		],
		static_libs: [
		"androidx-constraintlayout_constraintlayout",
		"androidx.annotation_annotation",
		"androidx.annotation_annotation-experimental",
		"androidx.appcompat_appcompat",
		"androidx.cardview_cardview",
		"androidx.coordinatorlayout_coordinatorlayout",
		"androidx-constraintlayout_constraintlayout",
		"androidx.core_core",
		"androidx.drawerlayout_drawerlayout",
		"androidx.dynamicanimation_dynamicanimation",
		"androidx.annotation_annotation-experimental",
		"androidx.fragment_fragment",
		"androidx.lifecycle_lifecycle-runtime",
		"androidx.recyclerview_recyclerview",
		@@ -37,7 +37,7 @@ android_library_import {
		android_library {
		name: "Eleven_com.google.android.material_material",
		sdk_version: "34",
		min_sdk_version: "14",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"//apex_available:anyapex",
		@@ -45,15 +45,15 @@ android_library {
		manifest: "com/google/android/material/material/1.9.0/AndroidManifest.xml",
		static_libs: [
		"Eleven_com.google.android.material_material-nodeps",
		"androidx-constraintlayout_constraintlayout",
		"androidx.annotation_annotation",
		"androidx.annotation_annotation-experimental",
		"androidx.appcompat_appcompat",
		"androidx.cardview_cardview",
		"androidx.coordinatorlayout_coordinatorlayout",
		"androidx-constraintlayout_constraintlayout",
		"androidx.core_core",
		"androidx.drawerlayout_drawerlayout",
		"androidx.dynamicanimation_dynamicanimation",
		"androidx.annotation_annotation-experimental",
		"androidx.fragment_fragment",
		"androidx.lifecycle_lifecycle-runtime",
		"androidx.recyclerview_recyclerview",
		@@ -62,5 +62,4 @@ android_library {
		"androidx.viewpager2_viewpager2",
		"error_prone_annotations",
		],
		java_version: "1.7",
		}