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
1 change: 0 additions & 1 deletion Jetcaster/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {
alias(libs.plugins.version.catalog.update)
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.ksp) apply false
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/data-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

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

android {
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/designsystem/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

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

Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/domain-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

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

android {
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/core/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/glancewidget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

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

Expand Down
3 changes: 3 additions & 0 deletions Jetcaster/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official

# Suppress error regarding kotlin.sourceSets with built-in Kotlin in AGP 9.0
android.disallowKotlinSourceSets=false
Comment on lines +40 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The android.disallowKotlinSourceSets property has been removed in Android Gradle Plugin 9.0.0 and is no longer recognized. Adding it to your gradle.properties file will cause a build failure. This property should be removed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true. I built the APK and ran it on my local machine. It worked fine.

Could you please give me the reference where you see this information?

9 changes: 4 additions & 5 deletions Jetcaster/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[versions]
accompanist = "0.37.3"
android-material3 = "1.13.0-alpha13"
androidGradlePlugin = "8.10.1"
androidGradlePlugin = "9.0.0"
androidx-activity-compose = "1.10.1"
androidx-appcompat = "1.7.1"
androidx-compose-bom = "2025.09.00"
Expand Down Expand Up @@ -35,7 +35,7 @@ compileSdk = "36"
coroutines = "1.10.2"
google-maps = "19.2.0"
gradle-versions = "0.52.0"
hilt = "2.56.2"
hilt = "2.59"
hiltExt = "1.2.0"
horologist = "0.7.15"
jdkDesugar = "2.1.5"
Expand All @@ -51,9 +51,9 @@ minSdk = "23"
okhttp = "4.12.0"
play-services-wearable = "19.0.0"
robolectric = "4.14.1"
roborazzi = "1.45.1"
roborazzi = "1.58.0"
rome = "2.1.0"
room = "2.7.1"
room = "2.8.4"
secrets = "2.0.1"
spotless = "7.0.4"
# @keep
Expand Down Expand Up @@ -177,7 +177,6 @@ compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradle-versions" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion Jetcaster/mobile/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.compose)
Expand Down
1 change: 0 additions & 1 deletion Jetcaster/tv/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.compose)
Expand Down
23 changes: 9 additions & 14 deletions Jetcaster/wear/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
*/
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias libs.plugins.roborazzi
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.compose)
}

android {
compileSdk 35
compileSdk 36

namespace "com.example.jetcaster"

Expand Down Expand Up @@ -55,10 +54,14 @@ android {
}
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.majorVersion
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
freeCompilerArgs = freeCompilerArgs + "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
freeCompilerArgs.addAll(
"-opt-in=kotlin.RequiresOptIn",
"-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"
)
}
}
buildFeatures {
compose true
Expand Down Expand Up @@ -87,14 +90,6 @@ dependencies {
implementation libs.androidx.activity.compose
implementation libs.androidx.core.splashscreen

// Compose for Wear OS Dependencies
// NOTE: DO NOT INCLUDE a dependency on androidx.compose.material:material.
// androidx.wear.compose:compose-material is designed as a replacement not an addition to
// androidx.compose.material:material. If there are features from that you feel are missing from
// androidx.wear.compose:compose-material please raise a bug to let us know:
// https://issuetracker.google.com/issues/new?component=1077552&template=1598429&pli=1
implementation libs.androidx.wear.compose.material

// For using the phone Typography
implementation libs.androidx.compose.material3

Expand Down