Skip to content

Commit 53b921d

Browse files
hannesa2hannesa2
committed
Prepare kts build
1 parent c45662c commit 53b921d

7 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎LogcatCoreLib/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id 'com.android.library'
3-
id 'kotlin-android'
4-
id 'maven-publish'
2+
id "com.android.library"
3+
id "kotlin-android"
4+
id "maven-publish"
55
}
66

77
android {
@@ -12,7 +12,7 @@ android {
1212
minSdkVersion 21
1313
project.archivesBaseName = "LogcatCore"
1414
}
15-
namespace 'info.hannes.logcat'
15+
namespace "info.hannes.logcat"
1616
compileOptions {
1717
sourceCompatibility JavaVersion.VERSION_17
1818
targetCompatibility JavaVersion.VERSION_17
@@ -26,8 +26,8 @@ dependencies {
2626
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
2727
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
2828
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
29-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
30-
api 'com.jakewharton.timber:timber:5.0.1'
29+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.7"
30+
api "com.jakewharton.timber:timber:5.0.1"
3131
}
3232

3333
publishing {

‎LogcatCoreUI/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id 'com.android.library'
3-
id 'kotlin-android'
4-
id 'maven-publish'
2+
id "com.android.library"
3+
id "kotlin-android"
4+
id "maven-publish"
55
}
66

77
android {
@@ -16,7 +16,7 @@ android {
1616
viewBinding = true
1717
buildConfig true
1818
}
19-
namespace 'info.hannes.logcat.ui'
19+
namespace "info.hannes.logcat.ui"
2020
compileOptions {
2121
sourceCompatibility JavaVersion.VERSION_17
2222
targetCompatibility JavaVersion.VERSION_17
@@ -25,13 +25,13 @@ android {
2525
}
2626

2727
dependencies {
28-
api project(':LogcatCoreLib')
28+
api project(":LogcatCoreLib")
2929
implementation "androidx.core:core-ktx:1.15.0"
3030
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3131
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
3232
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
33-
implementation 'androidx.recyclerview:recyclerview:1.4.0'
34-
api 'com.google.android.material:material:1.12.0'
33+
implementation "androidx.recyclerview:recyclerview:1.4.0"
34+
api "com.google.android.material:material:1.12.0"
3535
}
3636

3737
publishing {

‎LogcatCountlyLib/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id 'com.android.library'
3-
id 'kotlin-android'
4-
id 'maven-publish'
2+
id "com.android.library"
3+
id "kotlin-android"
4+
id "maven-publish"
55
}
66

77
android {
@@ -10,7 +10,7 @@ android {
1010
minSdkVersion 21
1111
project.archivesBaseName = "LogcatCountly"
1212
}
13-
namespace 'info.hannes.logcat.countly'
13+
namespace "info.hannes.logcat.countly"
1414
compileOptions {
1515
sourceCompatibility JavaVersion.VERSION_17
1616
targetCompatibility JavaVersion.VERSION_17
@@ -19,7 +19,7 @@ android {
1919
}
2020

2121
dependencies {
22-
api project(':LogcatCoreLib')
22+
api project(":LogcatCoreLib")
2323
api "ly.count.android:sdk:24.4.1"
2424
}
2525

‎LogcatCrashlyticLib/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'com.android.library'
3-
id 'kotlin-android'
4-
id 'maven-publish'
5-
id 'com.google.firebase.crashlytics'
2+
id "com.android.library"
3+
id "kotlin-android"
4+
id "maven-publish"
5+
id "com.google.firebase.crashlytics"
66
}
77

88
android {
@@ -11,7 +11,7 @@ android {
1111
minSdkVersion 21
1212
project.archivesBaseName = "LogcatCrashlytic"
1313
}
14-
namespace 'info.hannes.logcat.crashlytic'
14+
namespace "info.hannes.logcat.crashlytic"
1515
compileOptions {
1616
sourceCompatibility JavaVersion.VERSION_17
1717
targetCompatibility JavaVersion.VERSION_17
@@ -20,14 +20,14 @@ android {
2020
}
2121

2222
dependencies {
23-
api project(':LogcatCoreLib')
23+
api project(":LogcatCoreLib")
2424
// Import the BoM for the Firebase platform
25-
api platform('com.google.firebase:firebase-bom:33.5.0')
25+
api platform("com.google.firebase:firebase-bom:33.5.0")
2626

2727
// Add the dependencies for the Crashlytics and Analytics libraries
28-
// When using the BoM, you don't specify versions in Firebase library dependencies
29-
api 'com.google.firebase:firebase-crashlytics'
30-
api 'com.google.firebase:firebase-analytics-ktx'
28+
// When using the BoM, you don"t specify versions in Firebase library dependencies
29+
api "com.google.firebase:firebase-crashlytics"
30+
api "com.google.firebase:firebase-analytics-ktx"
3131
}
3232

3333
publishing {

‎app/build.gradle‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
plugins {
2-
id 'com.android.application'
3-
id 'kotlin-android'
4-
// id 'com.google.gms.google-services'
5-
// id 'com.google.firebase.crashlytics'
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// id "com.google.gms.google-services"
5+
// id "com.google.firebase.crashlytics"
66
}
77

88
if (useFirebase() == "true") {
9-
apply plugin: 'com.google.gms.google-services'
10-
apply plugin: 'com.google.firebase.crashlytics'
9+
apply plugin: "com.google.gms.google-services"
10+
apply plugin: "com.google.firebase.crashlytics"
1111
}
1212

1313
android {
14-
namespace 'info.hannes.logcat.app'
15-
testNamespace 'info.hannes.logcat.sampletest'
14+
namespace "info.hannes.logcat.app"
15+
testNamespace "info.hannes.logcat.sampletest"
1616

1717
defaultConfig {
18-
applicationId 'info.hannes.logcat.sample'
18+
applicationId "info.hannes.logcat.sample"
1919
versionCode 1
2020
versionName "1.0"
2121

2222
minSdkVersion 21
2323
compileSdk propCompileSdkVersion
2424
targetSdkVersion 35
2525

26-
buildConfigField "boolean", 'WITH_FIREBASE', useFirebase()
26+
buildConfigField "boolean", "WITH_FIREBASE", useFirebase()
2727

2828
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29-
testInstrumentationRunnerArguments useTestStorageService: 'true'
29+
testInstrumentationRunnerArguments useTestStorageService: "true"
3030
}
3131

3232
buildFeatures {
@@ -43,7 +43,7 @@ android {
4343
}
4444
packagingOptions {
4545
resources {
46-
pickFirsts += ['META-INF/atomicfu.kotlin_module']
46+
pickFirsts += ["META-INF/atomicfu.kotlin_module"]
4747
}
4848
}
4949

@@ -54,16 +54,16 @@ android {
5454
}
5555

5656
dependencies {
57-
implementation project(':LogcatCoreLib')
58-
implementation project(':LogcatCoreUI')
59-
implementation project(':LogcatCrashlyticLib')
60-
implementation project(':LogcatCountlyLib')
61-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
57+
implementation project(":LogcatCoreLib")
58+
implementation project(":LogcatCoreUI")
59+
implementation project(":LogcatCrashlyticLib")
60+
implementation project(":LogcatCountlyLib")
61+
implementation "androidx.legacy:legacy-support-v4:1.0.0"
6262
implementation "androidx.appcompat:appcompat:1.7.0"
6363
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
6464
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
6565

66-
androidTestImplementation 'com.github.AppDevNext:Moka:1.6'
66+
androidTestImplementation "com.github.AppDevNext:Moka:1.6"
6767
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
6868
androidTestUtil "androidx.test.services:test-services:1.5.0"
6969
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"

‎build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
buildscript {
2-
ext.kotlin_version = '2.1.10'
2+
ext.kotlin_version = "2.1.10"
33
repositories {
44
google()
55
mavenCentral()
66
maven { url "https://plugins.gradle.org/m2/" } // ktlint
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.1'
10+
classpath "com.android.tools.build:gradle:8.7.1"
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.2"
1313

14-
classpath 'com.google.gms:google-services:4.4.2'
15-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
14+
classpath "com.google.gms:google-services:4.4.2"
15+
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
1616
}
1717
}
1818

@@ -29,7 +29,7 @@ allprojects {
2929
repositories {
3030
google()
3131
mavenCentral()
32-
maven { url 'https://jitpack.io' }
32+
maven { url "https://jitpack.io" }
3333
}
3434
}
3535

@@ -41,13 +41,13 @@ ext {
4141
espresso_core = "3.4.0"
4242
}
4343

44-
@SuppressWarnings('unused')
44+
@SuppressWarnings("unused")
4545
static def getTag() {
4646
def process = "git describe --tags --abbrev=0".execute()
4747
return process.text.toString().trim()
4848
}
4949

50-
@SuppressWarnings('unused')
50+
@SuppressWarnings("unused")
5151
static def useFirebase() {
5252
def process = "grep DUMMYKEY app/google-services.json -R | wc -c".execute()
5353
def grepResult = process.text.toString().split(":")[1].toInteger()
@@ -56,7 +56,7 @@ static def useFirebase() {
5656
return result.toString()
5757
}
5858

59-
@SuppressWarnings('unused')
59+
@SuppressWarnings("unused")
6060
static def getGitCommitCount() {
6161
def process = "git describe --tags --abbrev=0".execute()
6262
return process.text.toString().trim()

‎settings.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
include ':LogcatCoreLib'
2-
include ':LogcatCoreUI'
3-
include ':LogcatCrashlyticLib'
4-
include ':LogcatCountlyLib'
5-
include ':app'
1+
include ":LogcatCoreLib"
2+
include ":LogcatCoreUI"
3+
include ":LogcatCrashlyticLib"
4+
include ":LogcatCountlyLib"
5+
include ":app"

0 commit comments

Comments
 (0)