Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ plugins {

android {
namespace = "com.example.platform"
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "com.example.platform"
minSdk = 24
targetSdk = 36
targetSdk = 37
versionCode = 1
versionName = "1.0"

Expand Down
12 changes: 9 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ org.gradle.java.installations.auto-download=false

# Disable build features that are enabled by default,
# https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
android.defaults.buildfeatures.buildconfig=false
android.defaults.buildfeatures.aidl=false
android.defaults.buildfeatures.renderscript=false
android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.enableAppCompileTimeRClass=false
android.usesSdkInManifest.disallowed=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
android.builtInKotlin=false
android.newDsl=false
Comment thread
alabiaga marked this conversation as resolved.
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# limitations under the License.
#
[versions]
agp = "8.13.2"
agp = "9.1.1"
fragmentCompose = "1.8.6"
kotlin = "2.1.10"
kotlin = "2.2.10"
coreKtx = "1.17.0"
junit = "4.13.2"
junitVersion = "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
15 changes: 13 additions & 2 deletions samples/accessibility/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,26 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

buildFeatures {
viewBinding = true
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

dependencies {
Expand Down
21 changes: 17 additions & 4 deletions samples/camera/camera2/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,27 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

buildFeatures {
viewBinding = true
}

viewBinding.isEnabled = true
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

dependencies {
Expand All @@ -53,4 +67,3 @@ dependencies {
// Link to UltraHDR Graphics Samples
implementation(project(mapOf("path" to ":samples:graphics:ultrahdr")))
}

8 changes: 7 additions & 1 deletion samples/camera/camerax/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,14 @@ android {
minSdk = 21
testOptions.targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
20 changes: 14 additions & 6 deletions samples/connectivity/UwbRanging/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,30 @@ android {

defaultConfig {
minSdk = 31
targetSdk = 35

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
kotlinOptions {
jvmTarget = "1.8"
}

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "11"
}

sourceSets {
getByName("main") {
java.srcDirs("src/main/java", "src/main/proto")
}
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

protobuf {
Expand Down
15 changes: 13 additions & 2 deletions samples/connectivity/audio/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,21 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
16 changes: 14 additions & 2 deletions samples/connectivity/bluetooth/ble/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,22 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
15 changes: 13 additions & 2 deletions samples/connectivity/bluetooth/companion/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,21 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
15 changes: 13 additions & 2 deletions samples/connectivity/callnotification/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
8 changes: 7 additions & 1 deletion samples/connectivity/telecom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ android {

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
15 changes: 13 additions & 2 deletions samples/graphics/pdf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,21 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
20 changes: 17 additions & 3 deletions samples/graphics/ultrahdr/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,27 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

buildFeatures {
viewBinding = true
}

viewBinding.isEnabled = true
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

dependencies {
Expand Down
15 changes: 13 additions & 2 deletions samples/location/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,21 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

Expand Down
20 changes: 17 additions & 3 deletions samples/media/ultrahdr/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,27 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 35
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

buildFeatures {
viewBinding = true
}

viewBinding.isEnabled = true
lint {
targetSdk = 35
}
testOptions {
targetSdk = 35
}
}

dependencies {
Expand Down
Loading
Loading