Skip to content

Commit 5fa38f5

Browse files
committed
Updated to Kotlin 2.1.0, gradle 8.5.2
1 parent b63cee4 commit 5fa38f5

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ android {
2727
}
2828

2929
compileOptions {
30-
sourceCompatibility JavaVersion.VERSION_1_8
31-
targetCompatibility JavaVersion.VERSION_1_8
30+
sourceCompatibility JavaVersion.VERSION_17
31+
targetCompatibility JavaVersion.VERSION_17
3232
}
3333
kotlinOptions {
34-
jvmTarget = '1.8'
34+
jvmTarget = '17'
3535
}
3636

3737
namespace 'cz.mroczis.netmonster.sample'

build.gradle

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.9.22'
4+
ext.kotlin_version = '2.1.0'
55
repositories {
66
google()
77
mavenCentral()
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.5.2'
11+
classpath 'com.android.tools.build:gradle:8.8.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
@@ -20,8 +20,4 @@ allprojects {
2020
google()
2121
mavenCentral()
2222
}
23-
}
24-
25-
task clean(type: Delete) {
26-
delete rootProject.buildDir
27-
}
23+
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Nov 02 22:18:30 CET 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

library/src/main/java/cz/mroczis/netmonster/core/feature/NrNsaStateParser.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class NrNsaStateParser {
5454
// Android standard way to detect connection
5555
val nrState = getStringField(serviceState, "nrState")
5656
/* Should be upper case by default; just in case, manufacturers tend to surprise all the time */
57-
.map { it.toUpperCase(Locale.getDefault()) }
57+
.map { it.uppercase(Locale.getDefault()) }
5858

5959
val nsaStateConnected = getIntField(serviceState, "nsaState").contains(5) // Huawei Android P
6060
val nsaStateAvailable = getIntField(serviceState, "nsaState").any { it in 2..4 } // Huawei Android P

0 commit comments

Comments
 (0)