diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3a75048..ec45c51 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,6 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.FileInputStream import java.util.Properties -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -51,13 +51,9 @@ android { kotlinOptions { jvmTarget = "11" } - buildToolsVersion = "34.0.0" buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.14" - } } dependencies { @@ -80,6 +76,6 @@ dependencies { tasks . withType ( KotlinCompile :: class ) . all { compilerOptions { - freeCompilerArgs . addAll ( "-opt-in=kotlin.ExperimentalUnsignedTypes" ) + freeCompilerArgs . addAll ("-opt-in=kotlin.ExperimentalUnsignedTypes") } } diff --git a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt index aa9ddd6..dcbe984 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/mqtt.kt @@ -1,13 +1,10 @@ package com.kernelmaft.zanbur +import MQTTClient import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import MQTTClient import mqtt.MQTTVersion import mqtt.Subscription import mqtt.packets.Qos.AT_MOST_ONCE diff --git a/app/src/main/java/com/kernelmaft/zanbur/persistence.kt b/app/src/main/java/com/kernelmaft/zanbur/persistence.kt index c318acc..09bf33b 100644 --- a/app/src/main/java/com/kernelmaft/zanbur/persistence.kt +++ b/app/src/main/java/com/kernelmaft/zanbur/persistence.kt @@ -7,4 +7,4 @@ import androidx.datastore.preferences.preferencesDataStore -val Context. dataStore : DataStore by preferencesDataStore ("state") +val Context . dataStore : DataStore by preferencesDataStore ("state") diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 722a1ac..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,2 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins {} diff --git a/gradle.properties b/gradle.properties index 95e0e0e..1d4f1fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,25 +1,5 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. For more details, visit -# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects -org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true - -org.gradle.configuration-cache=true +android.nonTransitiveRClass = true +android.useAndroidX = true +org.gradle.configuration-cache = true +org.gradle.jvmargs = -Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC +org.gradle.parallel = true diff --git a/settings.gradle.kts b/settings.gradle.kts index 03d4b5d..13ed56b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,6 @@ pluginManagement { } } dependencyResolutionManagement { - repositoriesMode . set ( RepositoriesMode . FAIL_ON_PROJECT_REPOS ) repositories { google () mavenCentral ()