Skip to content

update all version catalog dependencies except targetsdk and kotlin #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kimblebee wants to merge 9 commits into
base: kim/dependency/update-gradle-9.3.1
Choose a base branch
from
Open

update all version catalog dependencies except targetsdk and kotlin #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
338d7c3
Upgrade build infrastructure (AGP 9.3.1, Gradle 9.6.1)
Kimblebee Jul 31, 2026
6b85350
Fix Gradle 9 test task failures by removing empty test suites
Kimblebee Jul 31, 2026
c5db5b5
styling cleanups
Kimblebee Jul 31, 2026
f160538
update all version catalog dependencies except targetsdk and kotlinPl…
Kimblebee Jul 31, 2026
6c77cd4
update spotless and ktlint
Kimblebee Jul 31, 2026
4fdb416
Upgrade build infrastructure (AGP 9.3.1, Gradle 9.6.1)
Kimblebee Jul 31, 2026
bee3659
Fix Gradle 9 test task failures by removing empty test suites
Kimblebee Jul 31, 2026
178f266
styling cleanups
Kimblebee Jul 31, 2026
cea0e86
Merge remote-tracking branch 'origin/kim/dependency/update-gradle-9.3…
Kimblebee Aug 5, 2026
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ OEMs looking to validate their camera feature implementations.

This project uses the gradle build system, and can be imported directly into Android Studio.

Currently, Jetpack Camera App is built using the Android Gradle Plugin 8.10.0, which is only
compatible with Android Studio Meerkat or newer.
Currently, Jetpack Camera App is built using the Android Gradle Plugin 9.3.1, which is only
compatible with Android Studio Quail or newer.

## Pre-push Hook (Recommended)

Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
alias(libs.plugins.compose.compiler)
}
Expand Down
16 changes: 9 additions & 7 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.test)
alias(libs.plugins.kotlin.android)
}

android {
namespace = "com.google.jetpackcamera.benchmark"
compileSdk = libs.versions.compileSdk.get().toInt()

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

kotlinOptions {
jvmTarget = "1.8"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

defaultConfig {
Expand Down Expand Up @@ -69,6 +65,12 @@ android {
experimentalProperties["android.experimental.self-instrumenting"] = true
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

dependencies {
implementation(libs.androidx.junit)
implementation(libs.androidx.benchmark.macro.junit4)
Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.test) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.dagger.hilt.android) apply false
alias(libs.plugins.kotlin.kapt) apply false
alias(libs.plugins.android.legacy.kapt) apply false
alias(libs.plugins.compose.compiler) apply false
}

Expand Down
10 changes: 3 additions & 7 deletions core/camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down Expand Up @@ -93,10 +92,9 @@ android {
}
kotlin {
jvmToolchain(17)
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}
}

Expand Down Expand Up @@ -127,7 +125,6 @@ dependencies {
implementation(libs.camera.lifecycle)
implementation(libs.camera.video)


// Tracing
implementation(libs.androidx.tracing)
implementation(libs.kotlinx.atomicfu)
Expand All @@ -143,4 +140,3 @@ dependencies {

}


9 changes: 4 additions & 5 deletions core/camera/effects/single-stream/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand All @@ -35,9 +34,9 @@ android {
}
kotlin {
jvmToolchain(17)
}
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}
}

Expand Down
3 changes: 1 addition & 2 deletions core/camera/low-light-playservices/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
3 changes: 1 addition & 2 deletions core/camera/low-light/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
3 changes: 1 addition & 2 deletions core/camera/postprocess/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
1 change: 0 additions & 1 deletion core/camera/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
3 changes: 1 addition & 2 deletions core/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
1 change: 0 additions & 1 deletion core/common/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
3 changes: 1 addition & 2 deletions core/model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
}

android {
Expand Down
3 changes: 1 addition & 2 deletions core/settings/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
1 change: 0 additions & 1 deletion core/settings/datastore-prefs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
1 change: 0 additions & 1 deletion core/settings/datastore-prefs/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
6 changes: 2 additions & 4 deletions data/camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand All @@ -37,8 +36,7 @@ android {
buildTypes {
release {
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
getDefaultProguardFile("proguard-android-optimize.txt")
)
}
create("benchmark") {
Expand Down
2 changes: 2 additions & 0 deletions data/camera/consumer-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Add project specific consumer ProGuard rules here.
# More info: https://developer.android.com/studio/build/shrink-code
3 changes: 1 addition & 2 deletions data/media/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
1 change: 0 additions & 1 deletion data/media/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
3 changes: 1 addition & 2 deletions data/settings/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
1 change: 0 additions & 1 deletion data/settings/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

android {
Expand Down
3 changes: 1 addition & 2 deletions feature/permissions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler)

alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
}

Expand Down
11 changes: 4 additions & 7 deletions feature/postcapture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
alias(libs.plugins.compose.compiler)
}
Expand All @@ -33,7 +32,6 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}


flavorDimensions += "flavor"
productFlavors {
create("stable") {
Expand All @@ -48,6 +46,9 @@ android {
}
kotlin {
jvmToolchain(17)
compilerOptions {
freeCompilerArgs.add("-Xcontext-receivers")
}
}
buildFeatures {
buildConfig = true
Expand All @@ -74,10 +75,6 @@ android {
}
}
}

kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions feature/preview/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
alias(libs.plugins.compose.compiler)
}
Expand Down
3 changes: 1 addition & 2 deletions feature/settings/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.android.legacy.kapt)
alias(libs.plugins.dagger.hilt.android)
alias(libs.plugins.compose.compiler)
}
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
# Properties to make gradle managed devices testing more stable (see https://issuetracker.google.com/287312019#comment41)
android.experimental.testOptions.managedDevices.maxConcurrentDevices=1
android.experimental.testOptions.managedDevices.setupTimeoutMinutes=180
# Ensure we can run managed devices on servers that don't support hardware rendering
android.testoptions.manageddevices.emulator.gpu=swiftshader_indirect
android.testoptions.manageddevices.emulator.gpu=swiftshader_indirect
# Enabled parallel sync for Gradle 9.4+
org.gradle.tooling.parallel=true
4 changes: 2 additions & 2 deletions gradle/init.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

val ktlintVersion = "1.2.1"
val ktlintVersion = "1.8.0"

initscript {
val spotlessVersion = "6.25.0"
val spotlessVersion = "8.9.0"

repositories {
mavenCentral()
Expand Down
Loading
Loading