Skip to content

Commit 9d3421d

Browse files
committed
chore: change project-level build.gradle file to build.gradle.kts
1 parent 43f5214 commit 9d3421d

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ commands:
99
- restore_cache:
1010
key: v1-gradle-wrapper-{{ arch }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
1111
- restore_cache:
12-
key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle" }}-{{ checksum "settings.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}
12+
key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}
1313
restore_bundler_cache:
1414
steps:
1515
- restore_cache:
@@ -24,7 +24,7 @@ commands:
2424
- save_cache:
2525
paths:
2626
- ~/.gradle/caches
27-
key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle" }}-{{ checksum "settings.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}
27+
key: v1-gradle-cache-{{ arch }}-{{ checksum "build.gradle.kts" }}-{{ checksum "settings.gradle" }}-{{ checksum "gradle.properties" }}-{{ checksum "app/build.gradle.kts" }}
2828
save_bundler_cache:
2929
steps:
3030
- save_cache:

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/cache@v3
2929
with:
3030
path: ~/.gradle/caches
31-
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle') }}
31+
key: ${{ runner.OS }}-gradle-caches-cache-${{ hashFiles('build.gradle.kts') }}
3232
restore-keys: |
3333
${{ runner.OS }}-gradle-caches-cache-
3434
- name: generate ksProp file

build.gradle renamed to build.gradle.kts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
buildscript {
2-
ext {
3-
coroutines_version = "1.6.4"
4-
firebase_bom_version = "32.8.0"
5-
hilt_version = "2.56.2"
6-
jacoco_version = "0.8.8"
7-
kotlin_version = "2.1.20"
8-
material_version = "1.12.0"
9-
mockk_version = "1.14.2"
2+
extra.apply {
3+
set("coroutines_version", "1.6.4")
4+
set("firebase_bom_version", "32.8.0")
5+
set("hilt_version", "2.56.2")
6+
set("jacoco_version", "0.8.8")
7+
set("kotlin_version", "2.1.20")
8+
set("material_version", "1.12.0")
9+
set("mockk_version", "1.14.2")
1010
}
1111
dependencies {
12-
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
13-
classpath "com.google.gms:google-services:4.4.1"
14-
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
12+
classpath("com.google.dagger:hilt-android-gradle-plugin:${extra["hilt_version"]}")
13+
classpath("com.google.gms:google-services:4.4.1")
14+
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
1515
}
1616
}
1717

1818
plugins {
19-
id("com.android.application") version '8.10.1' apply false
19+
id("com.android.application") version "8.10.1" apply false
2020
id("org.jetbrains.kotlin.android") version "2.1.20" apply false
2121
id("org.jetbrains.kotlin.plugin.compose") version "2.1.20"
2222
id("org.sonarqube") version "3.5.0.2730"
2323
}
2424

25-
task clean(type: Delete) {
26-
delete layout.buildDirectory
25+
tasks.register<Delete>("clean") {
26+
delete(layout.buildDirectory)
2727
}
2828

2929
sonarqube {
@@ -35,7 +35,6 @@ sonarqube {
3535
property("sonar.host.url", "https://sonarcloud.io")
3636

3737
property("sonar.binaries", project(":app").layout.buildDirectory.dir("tmp/kotlin-classes/debug").get().asFile.absolutePath)
38-
// sonar requires absolute path for lint and jacoco reports!
3938
property("sonar.androidLint.reportPaths", project(":app").layout.buildDirectory.dir("reports/lint-results-debug.xml").get().asFile.absolutePath)
4039
property("sonar.coverage.jacoco.xmlReportPaths", project(":app").layout.buildDirectory.dir("mergedReportDir/jacocoTestReport/jacocoTestReport.xml").get().asFile.absolutePath)
4140
}

0 commit comments

Comments
 (0)