Skip to content

Commit 8c6eac5

Browse files
kirklandsignkirklandsign
authored
Update lib versions in Android apps (#214)
1 parent 0f427f8 commit 8c6eac5

20 files changed

Lines changed: 460 additions & 262 deletions

File tree

‎Yolo/android/app/build.gradle.kts‎

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,78 +7,80 @@
77
*/
88

99
plugins {
10-
id("com.android.application")
11-
id("org.jetbrains.kotlin.android")
10+
alias(libs.plugins.android.application)
11+
alias(libs.plugins.kotlin.android)
12+
alias(libs.plugins.kotlin.compose)
1213
}
1314

1415
val qnnVersion: String? = project.findProperty("qnnVersion") as? String
1516
val useLocalAar: Boolean? = (project.findProperty("useLocalAar") as? String)?.toBoolean()
1617

1718
android {
18-
namespace = "com.example.executorchyolodemo"
19-
compileSdk = 34
19+
namespace = "com.example.executorchyolodemo"
20+
compileSdk = 35
2021

21-
defaultConfig {
22-
applicationId = "com.example.executorchyolodemo"
23-
minSdk = 28
24-
targetSdk = 33
25-
versionCode = 1
26-
versionName = "1.0"
22+
defaultConfig {
23+
applicationId = "com.example.executorchyolodemo"
24+
minSdk = 28
25+
targetSdk = 35
26+
versionCode = 1
27+
versionName = "1.0"
2728

28-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
29-
vectorDrawables { useSupportLibrary = true }
30-
externalNativeBuild { cmake { cppFlags += "" } }
31-
}
29+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
30+
vectorDrawables { useSupportLibrary = true }
31+
externalNativeBuild { cmake { cppFlags += "" } }
32+
}
3233

33-
buildTypes {
34-
release {
35-
isMinifyEnabled = false
36-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
34+
buildTypes {
35+
release {
36+
isMinifyEnabled = false
37+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
38+
}
39+
}
40+
compileOptions {
41+
sourceCompatibility = JavaVersion.VERSION_11
42+
targetCompatibility = JavaVersion.VERSION_11
43+
}
44+
kotlinOptions {
45+
jvmTarget = "11"
3746
}
38-
}
39-
compileOptions {
40-
sourceCompatibility = JavaVersion.VERSION_1_8
41-
targetCompatibility = JavaVersion.VERSION_1_8
42-
}
43-
kotlinOptions { jvmTarget = "1.8" }
44-
buildFeatures { compose = true }
45-
composeOptions { kotlinCompilerExtensionVersion = "1.5.14" }
46-
packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
47+
buildFeatures {
48+
compose = true
49+
}
50+
packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
4751
}
4852

4953
dependencies {
50-
implementation("androidx.core:core-ktx:1.9.0")
51-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
52-
implementation("androidx.activity:activity-compose:1.7.0")
53-
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
54-
implementation("androidx.compose.ui:ui")
55-
implementation("androidx.compose.ui:ui-graphics")
56-
implementation("androidx.compose.ui:ui-tooling-preview")
57-
implementation("androidx.compose.material3:material3")
58-
implementation("androidx.appcompat:appcompat:1.6.1")
59-
implementation("androidx.camera:camera-core:1.3.0-rc02")
60-
implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha12")
61-
implementation("com.facebook.fbjni:fbjni:0.5.1")
62-
implementation("com.google.code.gson:gson:2.8.6")
63-
if (useLocalAar == true) {
64-
implementation(files("libs/executorch.aar"))
65-
} else {
66-
implementation("org.pytorch:executorch-android:1.1.0")
67-
}
68-
69-
implementation("com.google.android.material:material:1.12.0")
70-
implementation("androidx.activity:activity:1.9.0")
71-
implementation("org.json:json:20250107")
72-
testImplementation("junit:junit:4.13.2")
73-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
74-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
75-
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
76-
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
77-
debugImplementation("androidx.compose.ui:ui-tooling")
78-
debugImplementation("androidx.compose.ui:ui-test-manifest")
54+
implementation(libs.androidx.core.ktx)
55+
implementation(libs.androidx.lifecycle.runtime.ktx)
56+
implementation(libs.androidx.activity.compose)
57+
implementation(platform(libs.androidx.compose.bom))
58+
implementation(libs.androidx.ui)
59+
implementation(libs.androidx.ui.graphics)
60+
implementation(libs.androidx.ui.tooling.preview)
61+
implementation(libs.androidx.material3)
62+
implementation(libs.androidx.appcompat)
63+
implementation(libs.material)
64+
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
65+
implementation("com.facebook.fbjni:fbjni:0.5.1")
66+
implementation("com.google.code.gson:gson:2.10.1")
67+
if (useLocalAar == true) {
68+
implementation(files("libs/executorch.aar"))
69+
} else {
70+
implementation("org.pytorch:executorch-android:1.1.0")
71+
}
72+
implementation("androidx.activity:activity:1.9.0")
73+
implementation("org.json:json:20250107")
74+
testImplementation(libs.junit)
75+
androidTestImplementation(libs.androidx.junit)
76+
androidTestImplementation(libs.androidx.espresso.core)
77+
androidTestImplementation(platform(libs.androidx.compose.bom))
78+
androidTestImplementation(libs.androidx.ui.test.junit4)
79+
debugImplementation(libs.androidx.ui.tooling)
80+
debugImplementation(libs.androidx.ui.test.manifest)
7981

80-
implementation ("androidx.camera:camera-camera2:1.3.0")
81-
implementation ("androidx.camera:camera-lifecycle:1.3.0")
82-
implementation ("androidx.camera:camera-view:1.3.0")
83-
implementation ("com.google.code.gson:gson:2.10.1")
82+
implementation(libs.androidx.camera.core)
83+
implementation(libs.androidx.camera.camera2)
84+
implementation(libs.androidx.camera.lifecycle)
85+
implementation(libs.androidx.camera.view)
8486
}

‎Yolo/android/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1010
plugins {
11-
id("com.android.application") version "8.7.3" apply false
12-
id("org.jetbrains.kotlin.android") version "1.9.24" apply false
11+
alias(libs.plugins.android.application) apply false
12+
alias(libs.plugins.kotlin.android) apply false
13+
alias(libs.plugins.kotlin.compose) apply false
1314
}

‎Yolo/android/gradle/libs.versions.toml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[versions]
2+
agp = "8.9.0"
3+
kotlin = "2.0.21"
4+
coreKtx = "1.16.0"
5+
junit = "4.13.2"
6+
junitVersion = "1.3.0"
7+
espressoCore = "3.7.0"
8+
lifecycleRuntimeKtx = "2.9.2"
9+
activityCompose = "1.10.1"
10+
composeBom = "2024.09.00"
11+
appcompat = "1.7.1"
12+
material = "1.12.0"
13+
camera = "1.3.0"
14+
15+
[libraries]
16+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
17+
junit = { group = "junit", name = "junit", version.ref = "junit" }
18+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
19+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
20+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
21+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
22+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
23+
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
24+
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
25+
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
26+
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
27+
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
28+
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
29+
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
30+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
31+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
32+
androidx-camera-core = { group = "androidx.camera", name = "camera-core", version.ref = "camera" }
33+
androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2", version.ref = "camera" }
34+
androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "camera" }
35+
androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "camera" }
36+
37+
[plugins]
38+
android-application = { id = "com.android.application", version.ref = "agp" }
39+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
40+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

‎Yolo/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎cifar/android/CifarETTrainingDemo/app/build.gradle.kts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,15 @@ android {
2828
}
2929
}
3030
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_1_8
32-
targetCompatibility = JavaVersion.VERSION_1_8
31+
sourceCompatibility = JavaVersion.VERSION_11
32+
targetCompatibility = JavaVersion.VERSION_11
3333
}
3434
kotlinOptions {
35-
jvmTarget = "1.8"
35+
jvmTarget = "11"
3636
}
3737
buildFeatures {
3838
compose = true
3939
}
40-
composeOptions {
41-
kotlinCompilerExtensionVersion = "1.5.1"
42-
}
4340
packaging {
4441
resources {
4542
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎cifar/android/CifarETTrainingDemo/gradle/libs.versions.toml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ agp = "8.9.0"
33
kotlin = "2.0.21"
44
coreKtx = "1.16.0"
55
junit = "4.13.2"
6-
junitVersion = "1.2.1"
7-
espressoCore = "3.6.1"
8-
lifecycleRuntimeKtx = "2.9.1"
6+
junitVersion = "1.3.0"
7+
espressoCore = "3.7.0"
8+
lifecycleRuntimeKtx = "2.9.2"
99
activityCompose = "1.10.1"
1010
composeBom = "2024.09.00"
1111

@@ -29,4 +29,3 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
2929
android-application = { id = "com.android.application", version.ref = "agp" }
3030
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3131
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
32-

‎dl3/android/DeepLabV3Demo/app/build.gradle.kts‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,68 @@
77
*/
88

99
plugins {
10-
id("com.android.application")
11-
id("org.jetbrains.kotlin.android")
10+
alias(libs.plugins.android.application)
11+
alias(libs.plugins.kotlin.android)
12+
alias(libs.plugins.kotlin.compose)
1213
}
1314

1415
val useLocalAar: Boolean? = (project.findProperty("useLocalAar") as? String)?.toBoolean()
1516

1617
android {
17-
namespace = "org.pytorch.executorchexamples.dl3"
18-
compileSdk = 34
18+
namespace = "org.pytorch.executorchexamples.dl3"
19+
compileSdk = 35
1920

20-
defaultConfig {
21-
applicationId = "org.pytorch.executorchexamples.dl3"
22-
minSdk = 24
23-
targetSdk = 34
24-
versionCode = 1
25-
versionName = "1.0"
21+
defaultConfig {
22+
applicationId = "org.pytorch.executorchexamples.dl3"
23+
minSdk = 24
24+
targetSdk = 35
25+
versionCode = 1
26+
versionName = "1.0"
2627

27-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
28-
vectorDrawables { useSupportLibrary = true }
29-
}
28+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
29+
vectorDrawables { useSupportLibrary = true }
30+
}
3031

31-
buildTypes {
32-
release {
33-
isMinifyEnabled = false
34-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
32+
buildTypes {
33+
release {
34+
isMinifyEnabled = false
35+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
36+
}
37+
}
38+
compileOptions {
39+
sourceCompatibility = JavaVersion.VERSION_11
40+
targetCompatibility = JavaVersion.VERSION_11
41+
}
42+
kotlinOptions {
43+
jvmTarget = "11"
44+
}
45+
buildFeatures {
46+
compose = true
3547
}
36-
}
37-
compileOptions {
38-
sourceCompatibility = JavaVersion.VERSION_1_8
39-
targetCompatibility = JavaVersion.VERSION_1_8
40-
}
41-
kotlinOptions { jvmTarget = "1.8" }
42-
buildFeatures { compose = true }
43-
composeOptions { kotlinCompilerExtensionVersion = "1.5.14" }
4448
}
4549

4650
dependencies {
47-
implementation("androidx.core:core-ktx:1.12.0")
48-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
49-
implementation("androidx.activity:activity-compose:1.8.0")
50-
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
51-
implementation("androidx.compose.ui:ui")
52-
implementation("androidx.compose.ui:ui-graphics")
53-
implementation("androidx.compose.ui:ui-tooling-preview")
54-
implementation("androidx.compose.material3:material3")
55-
implementation("com.google.android.material:material:1.12.0")
56-
implementation("androidx.appcompat:appcompat:1.7.0")
57-
if (useLocalAar == true) {
58-
implementation(files("libs/executorch.aar"))
59-
implementation("com.facebook.fbjni:fbjni:0.5.1")
60-
} else {
61-
implementation("org.pytorch:executorch-android:1.0.1")
62-
}
63-
testImplementation("junit:junit:4.13.2")
64-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
65-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
66-
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
67-
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
68-
debugImplementation("androidx.compose.ui:ui-tooling")
69-
debugImplementation("androidx.compose.ui:ui-test-manifest")
51+
implementation(libs.androidx.core.ktx)
52+
implementation(libs.androidx.lifecycle.runtime.ktx)
53+
implementation(libs.androidx.activity.compose)
54+
implementation(platform(libs.androidx.compose.bom))
55+
implementation(libs.androidx.ui)
56+
implementation(libs.androidx.ui.graphics)
57+
implementation(libs.androidx.ui.tooling.preview)
58+
implementation(libs.androidx.material3)
59+
implementation(libs.material)
60+
implementation(libs.androidx.appcompat)
61+
if (useLocalAar == true) {
62+
implementation(files("libs/executorch.aar"))
63+
implementation("com.facebook.fbjni:fbjni:0.5.1")
64+
} else {
65+
implementation("org.pytorch:executorch-android:1.0.1")
66+
}
67+
testImplementation(libs.junit)
68+
androidTestImplementation(libs.androidx.junit)
69+
androidTestImplementation(libs.androidx.espresso.core)
70+
androidTestImplementation(platform(libs.androidx.compose.bom))
71+
androidTestImplementation(libs.androidx.ui.test.junit4)
72+
debugImplementation(libs.androidx.ui.tooling)
73+
debugImplementation(libs.androidx.ui.test.manifest)
7074
}

‎dl3/android/DeepLabV3Demo/app/src/main/java/org/pytorch/executorchexamples/dl3/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ class MainActivity : ComponentActivity() {
420420
}
421421

422422
val bmpSegmentation = Bitmap.createScaledBitmap(inputBitmap, width, height, true)
423-
val outputBitmap = bmpSegmentation.copy(bmpSegmentation.config, true)
423+
val outputBitmap = bmpSegmentation.copy(bmpSegmentation.config ?: Bitmap.Config.ARGB_8888, true)
424424
outputBitmap.setPixels(intValues, 0, width, 0, 0, width, height)
425425
val transferredBitmap = Bitmap.createScaledBitmap(
426426
outputBitmap,

‎dl3/android/DeepLabV3Demo/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1010
plugins {
11-
id("com.android.application") version "8.7.3" apply false
12-
id("org.jetbrains.kotlin.android") version "1.9.24" apply false
11+
alias(libs.plugins.android.application) apply false
12+
alias(libs.plugins.kotlin.android) apply false
13+
alias(libs.plugins.kotlin.compose) apply false
1314
}

0 commit comments

Comments
 (0)