Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Upgrade SpaLib AGP to 8.0.0-beta01" into udc-dev

Browse Source
This commit is contained in:
Chaohui Wang
2023-03-01 08:12:16 +00:00
committed by Android (Google) Code Review
parent 2350a1d1a4 22edba9cc6
commit 9c7f24397b
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/Spa/.idea/codeStyles/Project.xml generated
View File

@@ -1,17 +1,12 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value />
</option>
<option name="PACKAGES_IMPORT_LAYOUT"> <option name="PACKAGES_IMPORT_LAYOUT">
<value> <value>
<package name="" alias="false" withSubpackages="true" /> <package name="" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" /> <package name="" alias="true" withSubpackages="true" />
</value> </value>
</option> </option>
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<XML> <XML>

4
packages/SettingsLib/Spa/build.gradle
View File

@@ -24,7 +24,7 @@ buildscript {
} }
} }
plugins { plugins {
id 'com.android.application' version '7.3.1' apply false id 'com.android.application' version '8.0.0-beta01' apply false
id 'com.android.library' version '7.3.1' apply false id 'com.android.library' version '8.0.0-beta01' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
} }

2
packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -16,7 +16,7 @@
#Thu Jul 14 10:36:06 CST 2022 #Thu Jul 14 10:36:06 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME