Skip to content

Commit 3b4cd4e

Browse files
committed
migrate to built-in Kotlin
1 parent 2a5321e commit 3b4cd4e

3 files changed

Lines changed: 0 additions & 15 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
plugins {
2020
id "com.android.application"
21-
id "kotlin-android"
2221
id "jacoco"
2322
id "org.jlleitschuh.gradle.ktlint" version "14.0.1"
2423
}
@@ -41,7 +40,6 @@ dependencies {
4140
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
4241
implementation 'androidx.media:media:1.7.1'
4342
implementation 'androidx.preference:preference-ktx:1.2.1'
44-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4543
implementation 'com.jjoe64:graphview:4.2.2'
4644
// Unit Test Dependencies
4745
testImplementation 'androidx.test.ext:junit:1.3.0'
@@ -50,8 +48,6 @@ dependencies {
5048
testImplementation 'org.mockito:mockito-core:5.21.0'
5149
testImplementation 'org.mockito.kotlin:mockito-kotlin:6.2.3'
5250
testImplementation 'org.robolectric:robolectric:4.16.1'
53-
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
54-
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
5551
testImplementation 'org.slf4j:slf4j-simple:2.0.17'
5652
testImplementation 'org.assertj:assertj-core:3.27.7'
5753
testImplementation 'org.hamcrest:hamcrest:3.0'
@@ -121,9 +117,6 @@ android {
121117
sourceCompatibility = JavaVersion.VERSION_17
122118
targetCompatibility = JavaVersion.VERSION_17
123119
}
124-
kotlinOptions {
125-
jvmTarget = "17"
126-
}
127120

128121
lint {
129122
lintConfig = file("lint.xml")

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@
1919
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2020

2121
buildscript {
22-
ext {
23-
kotlin_version = '2.3.0'
24-
}
2522
repositories {
2623
google()
2724
mavenCentral()
2825
gradlePluginPortal() // Added for plugin resolution
2926
}
3027
dependencies {
3128
classpath 'com.android.tools.build:gradle:9.0.0'
32-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3329
classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0"
3430
}
3531
}

gradle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ android.jetifier.ignorelist=bcprov-jdk15on
2222
# Kotlin code style
2323
kotlin.code.style=official
2424

25-
# Default: true | Low Kotlin version is explicitly managed in `build.gradle`.
26-
android.builtInKotlin=false
27-
# Default: true | Build scripts may need DSL syntax updates.
28-
android.newDsl=false
2925
# Default: false | Release build may fail if R8 rules are incomplete.
3026
android.r8.strictFullModeForKeepRules=true
3127
# Default: false | Resources may be incorrectly removed, causing runtime crashes.

0 commit comments

Comments
 (0)