Merge "Migrate Spa to Kotlin DSL" into udc-qpr-dev am: 39b4f6bf13 (71ad377f) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/testutils/build.gradle→packages/SettingsLib/Spa/build.gradle.kts

+66 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,47 +14,53 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

			import com.android.build.gradle.BaseExtension
			import com.android.build.gradle.api.AndroidBasePlugin
			import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

	plugins {		plugins {
	id 'com.android.library'		alias(libs.plugins.android.application) apply false
	id 'kotlin-android'		alias(libs.plugins.android.library) apply false
			alias(libs.plugins.kotlin.android) apply false
			}

			allprojects {
			extra["jetpackComposeVersion"] = "1.4.0-beta01"
	}		}

	android {		subprojects {
	namespace 'com.android.settingslib.spa.testutils'		plugins.withType<AndroidBasePlugin> {
	compileSdk TARGET_SDK		configure<BaseExtension> {
	buildToolsVersion = BUILD_TOOLS_VERSION		compileSdkVersion(33)

	defaultConfig {		defaultConfig {
	minSdk MIN_SDK		minSdk = 21
	targetSdk TARGET_SDK		targetSdk = 34
	}		}

	sourceSets {		compileOptions {
	main {		sourceCompatibility = JavaVersion.VERSION_17
	kotlin {		targetCompatibility = JavaVersion.VERSION_17
	srcDir "src"
	}		}
	manifest.srcFile "AndroidManifest.xml"
	}		}
	}		}
	compileOptions {
	sourceCompatibility JavaVersion.VERSION_17		afterEvaluate {
	targetCompatibility JavaVersion.VERSION_17		plugins.withType<AndroidBasePlugin> {
			configure<BaseExtension> {
			if (buildFeatures.compose == true) {
			composeOptions {
			kotlinCompilerExtensionVersion = "1.4.4"
			}
	}		}
	buildFeatures {
	compose true
	}		}
	composeOptions {
	kotlinCompilerExtensionVersion jetpack_compose_compiler_version
	}		}
	}		}

	dependencies {		tasks.withType<KotlinCompile> {
	api project(":spa")		kotlinOptions {
			jvmTarget = "17"
	api "androidx.arch.core:core-testing:2.2.0-alpha01"		freeCompilerArgs = listOf("-Xjvm-default=all")
	api "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version"		}
	api "com.google.truth:truth:1.1.3"		}
	api "org.mockito:mockito-core:2.21.0"
	debugApi "androidx.compose.ui:ui-test-manifest:$jetpack_compose_version"
	}		}

packages/SettingsLib/Spa/build.gradle→packages/SettingsLib/Spa/gallery/build.gradle.kts

+24 −19

Original line number	Original line	Diff line number	Diff line
	@@ -14,27 +14,32 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	import org.jetbrains.kotlin.gradle.tasks.KotlinCompile		plugins {
			alias(libs.plugins.android.application)
			alias(libs.plugins.kotlin.android)
			}

			android {
			namespace = "com.android.settingslib.spa.gallery"

	buildscript {		defaultConfig {
	ext {		applicationId = "com.android.settingslib.spa.gallery"
	BUILD_TOOLS_VERSION = "30.0.3"		versionCode = 1
	MIN_SDK = 21		versionName = "1.0"
	TARGET_SDK = 33
	jetpack_compose_version = '1.4.0-beta01'
	jetpack_compose_compiler_version = '1.4.4'
	}		}

			sourceSets {
			sourceSets.getByName("main") {
			java.setSrcDirs(listOf("src"))
			res.setSrcDirs(listOf("res"))
			manifest.srcFile("AndroidManifest.xml")
	}		}
	plugins {
	id 'com.android.application' version '8.0.0' apply false
	id 'com.android.library' version '8.0.0' apply false
	id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
	}		}
	subprojects {		buildFeatures {
	tasks.withType(KotlinCompile).configureEach {		compose = true
	kotlinOptions {
	jvmTarget = "17"
	freeCompilerArgs = ["-Xjvm-default=all"]
	}		}
	}		}

			dependencies {
			implementation(project(":spa"))
	}		}

packages/SettingsLib/Spa/gradle/libs.versions.toml

0 → 100644

+30 −0

Original line number	Original line	Diff line number	Diff line
			#
			# Copyright (C) 2023 The Android Open Source Project
			#
			# Licensed under the Apache License, Version 2.0 (the "License");
			# you may not use this file except in compliance with the License.
			# You may obtain a copy of the License at
			#
			# http://www.apache.org/licenses/LICENSE-2.0
			#
			# Unless required by applicable law or agreed to in writing, software
			# distributed under the License is distributed on an "AS IS" BASIS,
			# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			# See the License for the specific language governing permissions and
			# limitations under the License.
			#

			[versions]
			agp = "8.0.2"
			dexmaker-mockito = "2.28.3"
			kotlin = "1.8.10"
			truth = "1.1"

			[libraries]
			dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }
			truth = { module = "com.google.truth:truth", version.ref = "truth" }

			[plugins]
			android-application = { id = "com.android.application", version.ref = "agp" }
			android-library = { id = "com.android.library", version.ref = "agp" }
			kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,9 +14,8 @@
	# limitations under the License.		# limitations under the License.
	#		#

	#Thu Jul 14 10:36:06 CST 2022
	distributionBase=GRADLE_USER_HOME		distributionBase=GRADLE_USER_HOME
	distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip		distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
	distributionPath=wrapper/dists		distributionPath=wrapper/dists
	zipStorePath=wrapper/dists		zipStorePath=wrapper/dists
	zipStoreBase=GRADLE_USER_HOME		zipStoreBase=GRADLE_USER_HOME

packages/SettingsLib/Spa/settings.gradle→packages/SettingsLib/Spa/settings.gradle.kts

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,20 +16,27 @@

	pluginManagement {		pluginManagement {
	repositories {		repositories {
	gradlePluginPortal()
	google()		google()
	mavenCentral()		mavenCentral()
			gradlePluginPortal()
	}		}
	}		}
	dependencyResolutionManagement {		dependencyResolutionManagement {
	repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)		repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
			rulesMode.set(RulesMode.FAIL_ON_PROJECT_RULES)

	repositories {		repositories {
	google()		google()
	mavenCentral()		mavenCentral()
	maven { url "https://jitpack.io"}		maven {
			url = uri("https://jitpack.io")
			content {
			includeGroup("com.github.PhilJay")
			}
			}
	}		}
	}		}
	rootProject.name = "SpaLib"		rootProject.name = "SpaLib"
	include ':spa'		include(":spa")
	include ':gallery'		include(":gallery")
	include ':testutils'		include(":testutils")