caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

kotlin 1.8.21

Browse source
This commit is contained in:
Milos Kozak 2023-04-25 16:22:42 +02:00
parent b2fce356c2
commit c28c56d778
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -2,7 +2,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.8.10' kotlin_version = '1.8.21'
core_version = '1.10.0' core_version = '1.10.0'
rxjava_version = '3.1.6' rxjava_version = '3.1.6'
rxandroid_version = '3.0.2' rxandroid_version = '3.0.2'

13
core/ns-sdk/src/main/java/info/nightscout/sdk/NSAndroidClientImpl.kt
View file

@ -292,14 +292,11 @@ class NSAndroidClientImpl(
lastModified = response.body()?.lastModified lastModified = response.body()?.lastModified
) )
} else throw UnknownResponseNightscoutException() } else throw UnknownResponseNightscoutException()
} else if (response.code() in 400..499) { } else return@callWrapper CreateUpdateResponse(
return@callWrapper CreateUpdateResponse( response = response.code(),
response = response.code(), identifier = null,
identifier = null, errorResponse = response.errorBody()?.string() ?: response.message()
errorResponse = response.errorBody()?.string() ?: response.message() )
)
} else
throw UnsuccessfullNightscoutException(response.errorBody()?.string() ?: response.message())
} }
override suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) { override suspend fun createTreatment(nsTreatment: NSTreatment): CreateUpdateResponse = callWrapper(dispatcher) {

8
gradle.properties
View file

@ -24,3 +24,11 @@ android.useAndroidX=true
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
# Cache is causeing issues with CircleCI nad maybe Studio 2021 # Cache is causeing issues with CircleCI nad maybe Studio 2021
# org.gradle.unsafe.configuration-cache=true # org.gradle.unsafe.configuration-cache=true
# After migration to kotlin 1.8.21
#e: org.jetbrains.kotlin.backend.common.BackendException: Backend Internal error: Exception during psi2ir
# File being compiled: (37,18) in /home/circleci/project/core/interfaces/src/main/java/info/nightscout/interfaces/pump/defs/PumpCapability.kt
# The root cause org.jetbrains.kotlin.psi2ir.generators.ErrorExpressionException was thrown at: org.jetbrains.kotlin.psi2ir.generators.ErrorExpressionGenerator.generateErrorCall(ErrorExpressionGenerator.kt:100)
# null: KtCallExpression
# https://youtrack.jetbrains.com/issue/KT-58027
kapt.use.jvm.ir=false