Clean up build after upstreaming
Remove custom compile SDK usage, fix build properties, fix bad merge in
library versions, re-pin core to tip-of-tree. Update Ads to be compatible
with SDK 24.
Bug: 286566456
Test: ./gradlew bOS
Merged-In: I85c88fe1e8cb2f24bcf328aeb4ae2bfa3c9cc20c
Change-Id: Ifb7c1d94ea44cf7e4f373dfa4a6b9bd2f3210010
diff --git a/development/studio/idea.properties b/development/studio/idea.properties
index 3cabbbf..6f9146c 100644
--- a/development/studio/idea.properties
+++ b/development/studio/idea.properties
@@ -5,12 +5,12 @@
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to IDE config folder. Make sure you're using forward slashes.
#---------------------------------------------------------------------
-idea.config.path=${user.home}/.AndroidStudioAndroidXPlatform/config
+idea.config.path=${user.home}/.AndroidStudioAndroidX/config
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to IDE system folder. Make sure you're using forward slashes.
#---------------------------------------------------------------------
-idea.system.path=${user.home}/.AndroidStudioAndroidXPlatform/system
+idea.system.path=${user.home}/.AndroidStudioAndroidX/system
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes.
@@ -194,4 +194,4 @@
#-----------------------------------------------------------------------
# Enable compose @Preview rendering
#-----------------------------------------------------------------------
-compose.project.uses.compose.override=true
\ No newline at end of file
+compose.project.uses.compose.override=true
diff --git a/gradle.properties b/gradle.properties
index 0d6a6fe..9bde541 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,14 +26,14 @@
android.forceJacocoOutOfProcess=true
android.experimental.lint.missingBaselineIsEmptyBaseline=true
-# Don't generate versioned API files
-androidx.writeVersionedApiFiles=false
+# Do generate versioned API files
+androidx.writeVersionedApiFiles=true
-# Don't run the CheckAarMetadata task
-android.experimental.disableCompileSdkChecks=true
+# Do run the CheckAarMetadata task
+android.experimental.disableCompileSdkChecks=false
-# Don't restrict compileSdkPreview usage
-androidx.allowCustomCompileSdk=true
+# Do restrict custom SDK usage (e.g. Mainline)
+androidx.allowCustomCompileSdk=false
# Don't warn about needing to update AGP
android.suppressUnsupportedCompileSdk=UpsideDownCake,VanillaIceCream,33,34
diff --git a/libraryversions.toml b/libraryversions.toml
index 162a9a9..bbf317e 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -68,7 +68,6 @@
GRAPHICS_FILTERS = "1.0.0-alpha01"
GRAPHICS_SHAPES = "1.0.0-alpha03"
GRIDLAYOUT = "1.1.0-beta02"
-GRIDLAYOUT = "1.1.0-beta01"
HEALTH_CONNECT = "1.1.0-alpha02"
HEALTH_SERVICES_CLIENT = "1.1.0-alpha01"
HEIFWRITER = "1.1.0-alpha02"
diff --git a/privacysandbox/ads/ads-adservices-java/build.gradle b/privacysandbox/ads/ads-adservices-java/build.gradle
index d4734a0..57b63ad 100644
--- a/privacysandbox/ads/ads-adservices-java/build.gradle
+++ b/privacysandbox/ads/ads-adservices-java/build.gradle
@@ -49,8 +49,6 @@
}
android {
- compileSdk = 33
- compileSdkExtension = 5
namespace "androidx.privacysandbox.ads.adservices.java"
}
diff --git a/privacysandbox/ads/ads-adservices/build.gradle b/privacysandbox/ads/ads-adservices/build.gradle
index e7fdf07..3e50880 100644
--- a/privacysandbox/ads/ads-adservices/build.gradle
+++ b/privacysandbox/ads/ads-adservices/build.gradle
@@ -44,8 +44,6 @@
}
android {
- compileSdk = 33
- compileSdkExtension = 5
namespace "androidx.privacysandbox.ads.adservices"
}
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
index 486fe73..f79d101 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-client/build.gradle
@@ -25,11 +25,11 @@
dependencies {
api(libs.kotlinStdlib)
api(libs.kotlinCoroutinesCore)
- implementation("androidx.core:core-ktx:1.12.0-alpha03")
+ implementation(projectOrArtifact(":core:core-ktx"))
api project(path: ':privacysandbox:sdkruntime:sdkruntime-core')
- implementation("androidx.core:core:1.12.0-alpha03")
+ implementation(projectOrArtifact(":core:core"))
implementation(projectOrArtifact(":activity:activity"))
testImplementation(libs.junit)
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
index ca4567e..facccb1 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
+++ b/privacysandbox/sdkruntime/sdkruntime-core/build.gradle
@@ -26,7 +26,7 @@
api(libs.kotlinStdlib)
api("androidx.annotation:annotation:1.6.0")
- implementation("androidx.core:core:1.12.0-alpha03")
+ implementation(projectOrArtifact(":core:core"))
implementation(projectOrArtifact(":activity:activity"))
// TODO(b/249982004): cleanup dependencies
diff --git a/privacysandbox/ui/integration-tests/testaidl/build.gradle b/privacysandbox/ui/integration-tests/testaidl/build.gradle
index 88ca40c..0375687 100644
--- a/privacysandbox/ui/integration-tests/testaidl/build.gradle
+++ b/privacysandbox/ui/integration-tests/testaidl/build.gradle
@@ -22,8 +22,6 @@
android {
namespace 'androidx.privacysandbox.ui.integration.testaidl'
- compileSdk 33
- compileSdkExtension = 5
defaultConfig {
minSdk 33
diff --git a/privacysandbox/ui/integration-tests/testapp/build.gradle b/privacysandbox/ui/integration-tests/testapp/build.gradle
index 518a00a..a3d4c86 100644
--- a/privacysandbox/ui/integration-tests/testapp/build.gradle
+++ b/privacysandbox/ui/integration-tests/testapp/build.gradle
@@ -22,8 +22,6 @@
android {
namespace 'androidx.privacysandbox.ui.integration.testapp'
- compileSdk 33
- compileSdkExtension = 5
defaultConfig {
applicationId "androidx.privacysandbox.ui.integration.testapp"
diff --git a/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle b/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
index 53365be..7a18717 100644
--- a/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
+++ b/privacysandbox/ui/integration-tests/testsdkprovider/build.gradle
@@ -22,8 +22,6 @@
android {
namespace 'androidx.privacysandbox.ui.integration.testsdkprovider'
- compileSdk 33
- compileSdkExtension = 5
defaultConfig {
applicationId "androidx.privacysandbox.ui.integration.testsdkprovider"
diff --git a/privacysandbox/ui/integration-tests/testsdkprovider/src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkApi.kt b/privacysandbox/ui/integration-tests/testsdkprovider/src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkApi.kt
index 2045f7c..2287d4a 100644
--- a/privacysandbox/ui/integration-tests/testsdkprovider/src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkApi.kt
+++ b/privacysandbox/ui/integration-tests/testsdkprovider/src/main/java/androidx/privacysandbox/ui/integration/testsdkprovider/SdkApi.kt
@@ -107,12 +107,12 @@
}
private inner class TestView(context: Context) : View(context) {
- override fun onDraw(canvas: Canvas?) {
+ override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
val paint = Paint()
paint.textSize = 50F
- canvas!!.drawColor(
+ canvas.drawColor(
Color.rgb((0..255).random(), (0..255).random(), (0..255).random())
)
canvas.drawText("Hey", 75F, 75F, paint)
diff --git a/settings.gradle b/settings.gradle
index 29b102a..7af57f6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -95,9 +95,9 @@
value("androidx.projects", getRequestedProjectSubsetName() ?: "Unset")
value("androidx.useMaxDepVersions", providers.gradleProperty("androidx.useMaxDepVersions").isPresent().toString())
- // Do not publish scan for androidx-platform-dev
- // publishAlways()
- // publishIfAuthenticated()
+ // Publish scan for androidx-main
+ publishAlways()
+ publishIfAuthenticated()
}
}
