Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (25201a6a) · Commits · e / os / android_packages_apps_Etar

app/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ android_app {
		"kotlinx-coroutines-core",
		"kotlinx-coroutines-android",
		"Etar-Calendar_org.dmfs_lib-recur",
		"androidx.lifecycle_lifecycle-livedata-ktx",
		] + [
		"android-common",
		"android-opt-timezonepicker",

app/build.gradle.kts

+34 −6

Original line number	Diff line number	Diff line
		import com.android.build.gradle.internal.tasks.factory.dependsOn
		import org.lineageos.generatebp.GenerateBpPlugin
		import org.lineageos.generatebp.GenerateBpPluginExtension
		import org.lineageos.generatebp.models.Module

		plugins {
		id("com.android.application")
		@@ -6,6 +9,20 @@ plugins {
		id("org.ec4j.editorconfig")
		}

		apply {
		plugin<GenerateBpPlugin>()
		}

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

		dependencies {
		classpath("org.lineageos:gradle-generatebp:+")
		}
		}

		editorconfig {
		excludes = listOf("external/", "metadata/", "*/.webp")
		}
		@@ -18,8 +35,8 @@ android {
		defaultConfig {
		minSdk = 26
		targetSdk = 34
		versionCode = 45
		versionName = "1.0.45"
		versionCode = 46
		versionName = "1.0.46"
		applicationId = "ws.xsoh.etar"
		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
		}
		@@ -51,10 +68,6 @@ android {
		}
		}

		buildFeatures {
		viewBinding = true
		}

		/*
		* To sign release build, create file gradle.properties in ~/.gradle/ with this content:
		*
		@@ -137,6 +150,21 @@ dependencies {
		// https://mvnrepository.com/artifact/org.dmfs/lib-recur
		implementation("org.dmfs:lib-recur:0.16.0")

		// lifecycle
		val lifecycle_version = "2.7.0"
		implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
		}

		configure<GenerateBpPluginExtension> {
		targetSdk.set(android.defaultConfig.targetSdk!!)
		availableInAOSP.set { module: Module ->
		when {
		module.group.startsWith("androidx") -> true
		module.group.startsWith("com.google") -> true
		module.group.startsWith("org.jetbrains") -> true
		else -> false
		}
		}
		}

		tasks.preBuild.dependsOn(":aarGen")

app/generatebp.gradle.kts

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		import org.lineageos.generatebp.GenerateBpPlugin
		import org.lineageos.generatebp.GenerateBpPluginExtension
		import org.lineageos.generatebp.models.Module

		apply {
		plugin<GenerateBpPlugin>()
		}

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

		dependencies {
		classpath("org.lineageos:gradle-generatebp:+")
		}
		}

		configure<GenerateBpPluginExtension> {
		targetSdk.set(extra.get("targetSdk") as Int)
		availableInAOSP.set { module: Module ->
		when {
		module.group.startsWith("androidx") -> true
		module.group.startsWith("com.google") -> true
		module.group.startsWith("org.jetbrains") -> true
		else -> false
		}
		}
		}

app/libs/Android.bp

+4 −4

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

		@@ -7,7 +7,7 @@

		java_import {
		name: "Etar-Calendar_org.dmfs_jems2-nodeps",
		jars: ["org/dmfs/jems2/2.11.1/jems2-2.11.1.jar"],
		jars: ["org/dmfs/jems2/2.22.0/jems2-2.22.0.jar"],
		sdk_version: "34",
		min_sdk_version: "14",
		apex_available: [
		@@ -32,7 +32,7 @@ java_library_static {

		java_import {
		name: "Etar-Calendar_org.dmfs_lib-recur-nodeps",
		jars: ["org/dmfs/lib-recur/0.15.0/lib-recur-0.15.0.jar"],
		jars: ["org/dmfs/lib-recur/0.16.0/lib-recur-0.16.0.jar"],
		sdk_version: "34",
		min_sdk_version: "14",
		apex_available: [
		@@ -51,8 +51,8 @@ java_library_static {
		],
		static_libs: [
		"Etar-Calendar_org.dmfs_lib-recur-nodeps",
		"Etar-Calendar_org.dmfs_rfc5545-datetime",
		"Etar-Calendar_org.dmfs_jems2",
		"Etar-Calendar_org.dmfs_rfc5545-datetime",
		],
		java_version: "1.7",
		}

app/libs/org/dmfs/jems2/2.11.1/jems2-2.11.1.jar.license

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		SPDX-FileCopyrightText: 2023 Marten Gajda