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 .github/workflows/build_and_local_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'zulu'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/instrumented_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
api-level: [23, 26, 29]
api-level: [24, 26, 29]

steps:
- name: Enable KVM group perms
Expand All @@ -23,10 +23,10 @@ jobs:
ls /dev/kvm

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'zulu'
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ plugins {

android {
namespace = "android.template"
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "android.template"
minSdk = 23
targetSdk = 36
minSdk = 24
targetSdk = 37
versionCode = 1
versionName = "1.0"

Expand Down
9 changes: 9 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@
*/

// Root build.gradle.kts
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.compose.compiler) apply false
alias(libs.plugins.hilt.gradle) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kotlin.serialization) apply false
}
4 changes: 2 additions & 2 deletions core-data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ plugins {

android {
namespace = "android.template.core.data"
compileSdk = 36
compileSdk = 37

defaultConfig {
minSdk = 23
minSdk = 24
testInstrumentationRunner = "android.template.core.testing.HiltTestRunner"
consumerProguardFiles("consumer-rules.pro")
}
Expand Down
5 changes: 2 additions & 3 deletions core-database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,17 @@ plugins {

android {
namespace = "android.template.core.database"
compileSdk = 36
compileSdk = 37

defaultConfig {
minSdk = 23
minSdk = 24
testInstrumentationRunner = "android.template.core.testing.HiltTestRunner"
consumerProguardFiles("consumer-rules.pro")
}

buildFeatures {
aidl = false
buildConfig = false
renderScript = false
shaders = false
}

Expand Down
4 changes: 2 additions & 2 deletions core-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ plugins {

android {
namespace = "android.template.core.testing"
compileSdk = 36
compileSdk = 37

defaultConfig {
minSdk = 23
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
Expand Down
5 changes: 2 additions & 3 deletions core-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ plugins {

android {
namespace = "android.template.core.ui"
compileSdk = 36
compileSdk = 37

defaultConfig {
minSdk = 23
minSdk = 24
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
Expand All @@ -35,7 +35,6 @@ android {
compose = true
aidl = false
buildConfig = false
renderScript = false
shaders = false
}

Expand Down
4 changes: 2 additions & 2 deletions feature-mymodel-navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ plugins {

android {
namespace = "android.template.feature.mymodel.navigation"
compileSdk = 36
compileSdk = 37
defaultConfig {
minSdk = 23
minSdk = 24
consumerProguardFiles("consumer-rules.pro")
}
buildFeatures {
Expand Down
4 changes: 2 additions & 2 deletions feature-mymodel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ plugins {

android {
namespace = "android.template.feature.mymodel"
compileSdk = 36
compileSdk = 37

defaultConfig {
minSdk = 23
minSdk = 24

testInstrumentationRunner = "android.template.core.testing.HiltTestRunner"
consumerProguardFiles("consumer-rules.pro")
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
androidGradlePlugin = "9.2.1"
androidGradlePlugin = "9.4.1"
androidxActivity = "1.13.0"
androidxComposeBom = "2026.05.01"
androidxCore = "1.18.0"
androidxHilt = "1.3.0"
androidxLifecycle = "2.10.0"
androidxRoom = "2.8.4"
androidxComposeBom = "2026.09.00"
androidxCore = "1.19.1"
androidxHilt = "1.4.0"
androidxLifecycle = "2.11.0"
androidxRoom = "2.8.5"
androidxTestCore = "1.7.0"
androidxTestExt = "1.3.0"
androidxTestRunner = "1.7.0"
coroutines = "1.11.0"
hilt = "2.59.2"
hilt = "2.60.1"
junit = "4.13.2"
kotlin = "2.3.21"
kotlin = "2.4.20"
kotlinxSerializationCore = "1.11.0"
ksp = "2.3.9"
lifecycleViewmodelNav3 = "2.10.0"
nav3Core = "1.1.2"
ksp = "2.3.12"
lifecycleViewmodelNav3 = "2.11.0"
nav3Core = "1.2.0"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
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-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 3 additions & 6 deletions test-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,26 @@

import org.jetbrains.kotlin.gradle.dsl.JvmTarget

@Suppress("DSL_SCOPE_VIOLATION") // Remove when fixed https://youtrack.jetbrains.com/issue/KTIJ-19369
plugins {
alias(libs.plugins.android.test)

alias(libs.plugins.ksp)
}

android {
namespace = "android.template.test.navigation"
compileSdk = 36
compileSdk = 37
targetProjectPath = ":app"

defaultConfig {
minSdk = 23
targetSdk = 36
minSdk = 24
targetSdk = 37

testInstrumentationRunner = "android.template.core.testing.HiltTestRunner"
}

buildFeatures {
aidl = false
buildConfig = false
renderScript = false
shaders = false
}

Expand Down
Loading