Skip to content
Open
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 README.md
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
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
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
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
7 changes: 0 additions & 7 deletions core/camera/build.gradle.kts
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 @@ -94,10 +93,6 @@ android {
kotlin {
jvmToolchain(17)
}

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

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


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

}


6 changes: 1 addition & 5 deletions core/camera/effects/single-stream/build.gradle.kts
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 @@ -36,9 +35,6 @@ android {
kotlin {
jvmToolchain(17)
}
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
}
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions core/camera/low-light-playservices/build.gradle.kts
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
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
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
Loading
Loading