diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index 2841082a..00000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,238 +0,0 @@ -[versions] -accompanist = "0.30.1" -androidDesugarJdkLibs = "2.0.3" -androidGradlePlugin = "8.1.0" -androidxActivity = "1.7.2" -androidxAnnotation = "1.6.0" -androidxAppCompat = "1.6.1" -androidxComposeBom = "2023.06.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping -androidxComposeCompiler = "1.5.1" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin -androidxComposeRuntimeTracing = "1.0.0-alpha03" -androidxCore = "1.10.1" -androidxCoreSplashscreen = "1.0.1" -androidxDataStore = "1.0.0" -androidxEspresso = "3.5.1" -androidxHiltNavigationCompose = "1.0.0" -androidxLifecycle = "2.6.1" -androidxLocalbroadcastmanager = "1.1.0" -androidxMacroBenchmark = "1.1.1" -androidxNavigation = "2.6.0" -androidxMetrics = "1.0.0-alpha04" -androidxProfileinstaller = "1.3.1" -androidxStartup = "1.1.1" -androidxWindowManager = "1.1.0" -androidxTestCore = "1.5.0" -androidxTestExt = "1.1.5" -androidxTestRunner = "1.5.2" -androidxTestRules = "1.5.0" -androidxTracing = "1.1.0" -androidxUiAutomator = "2.2.0" -androidxWork = "2.8.1" -coil = "2.4.0" -firebaseBom = "32.2.0" -hilt = "2.47" -hiltExt = "1.0.0" -jacoco = "0.8.7" -junit4 = "4.13.2" -kotlin = "1.9.0" -kotlinxCoroutines = "1.7.3" -kotlinxDatetime = "0.4.0" -kotlinxSerializationJson = "1.5.1" -ksp = "1.9.0-1.0.12" -lint = "31.1.0" -memfault-cloud = "2.0.5" -okhttp = "4.11.0" -protobuf = "3.23.4" -protobufPlugin = "0.9.4" -publishPlugin = "1.2.0" -retrofit = "2.9.0" -retrofitKotlinxSerializationJson = "1.0.0" -room = "2.5.2" -secrets = "2.0.1" -turbine = "1.0.0" -markdown = "0.3.0" -wirePlugin = "4.7.2" -timber = "5.0.1" -chart = "v3.1.0" -leakcanary = "2.12" -mockk = "1.13.5" -slf4j = "2.0.7" -robolectric = "4.10.3" -skydovesBallon = "1.5.4" -moshiKotlin = "1.15.0" -moshiAdapters = "1.15.0" -okio = "3.4.0" - -nordic-blek = "0.2.1" -nordic-ble = "2.6.1" -nordic-dfu = "2.3.0" -nordic-log = "2.3.0" -nordic-mcumgr = "1.7.0" -nordic-scanner = "1.6.0" -nordic-common = "1.8.0" -nordic-memfault = "1.0.2" -nordicPlugins = "1.7.1" -dokkaPlugin = "1.8.20" -googleServicesPlugins = "4.3.15" -firebaseCrashlyticsPlugins = "2.9.2" - -[libraries] -accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" } -accompanist-swiperefresh = { group = "com.google.accompanist", name = "accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" } -accompanist-pagerindicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" } -accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" } -android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" } -androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidxAnnotation" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" } -androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" } -androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } -androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" } -androidx-compose-material = { group = "androidx.compose.material", name = "material" } -androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } -androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } -androidx-compose-material3-windowSizeClass = {group = "androidx.compose.material3", name = "material3-window-size-class" } -androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" } -androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } -androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" } -androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-compose-ui-testManifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util" } -androidx-core = { group = "androidx.core", name = "core", version.ref = "androidxCore" } -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } -androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" } -androidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" } -androidx-dataStore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDataStore" } -androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" } -androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewModel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewModel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewModel-savedState = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" } -androidx-localbroadcastmanager = { group = "androidx.localbroadcastmanager", name = "localbroadcastmanager", version.ref = "androidxLocalbroadcastmanager" } -androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", version.ref = "androidxMetrics" } -androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } -androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "androidxNavigation" } -androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" } -androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidxStartup" } -androidx-window-manager = {module = "androidx.window:window", version.ref = "androidxWindowManager"} -androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" } -androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" } -androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxEspresso" } -androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" } -androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } -androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "androidxUiAutomator" } -androidx-tracing-ktx = {group = "androidx.tracing", name="tracing-ktx", version.ref = "androidxTracing" } -androidx-work-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidxWork" } -androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "androidxWork" } -coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil"} -coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil"} -coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil"} -firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom"} -firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } -firebase-database = { group = "com.google.firebase", name = "firebase-database-ktx" } -firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" } -hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } -hilt-ext-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltExt" } -hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltExt" } -hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } -hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } -junit4 = { group = "junit", name = "junit", version.ref = "junit4" } -kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" } -kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } -kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } -kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" } -kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } -lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" } -okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } -protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" } -protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" } -turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" } -retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } -retrofit-kotlin-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" } -room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } -room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } -room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } -markdown = { group = "com.github.jeziellago", name = "compose-markdown", version.ref = "markdown" } -memfault-cloud = { group = "com.memfault.cloud", name = "cloud-android", version.ref = "memfault-cloud" } -timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" } -chart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "chart" } -leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" } -test-slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } -test-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } -test-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } -skydoves-ballon = {group = "com.github.skydoves", name = "balloon-compose", version.ref = "skydovesBallon"} -moshi-kotlin = {group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "moshiKotlin"} -moshi-adapters = {group = "com.squareup.moshi", name = "moshi-adapters", version.ref = "moshiAdapters"} -okio = {group = "com.squareup.okio", name = "okio", version.ref = "okio"} - -# Nordic -nordic-ble-ktx = { group = "no.nordicsemi.android", name = "ble-ktx", version.ref = "nordic-ble" } -nordic-ble-common = { group = "no.nordicsemi.android", name = "ble-common", version.ref = "nordic-ble" } -nordic-dfu = { group = "no.nordicsemi.android", name = "dfu", version.ref = "nordic-dfu" } -nordic-mcumgr-core = { group = "no.nordicsemi.android", name = "mcumgr-core", version.ref = "nordic-mcumgr" } -nordic-mcumgr-ble = { group = "no.nordicsemi.android", name = "mcumgr-ble", version.ref = "nordic-mcumgr" } -nordic-log = { group = "no.nordicsemi.android", name = "log", version.ref = "nordic-log" } -nordic-log-timber = { group = "no.nordicsemi.android", name = "log-timber", version.ref = "nordic-log" } -nordic-scanner = { group = "no.nordicsemi.android.support.v18", name = "scanner", version.ref = "nordic-scanner" } -nordic-core = { group = "no.nordicsemi.android.common", name = "core", version.ref = "nordic-common" } -nordic-theme = { group = "no.nordicsemi.android.common", name = "theme", version.ref = "nordic-common" } -nordic-analytics = { group = "no.nordicsemi.android.common", name = "analytics", version.ref = "nordic-common" } -nordic-navigation = { group = "no.nordicsemi.android.common", name = "navigation", version.ref = "nordic-common" } -nordic-uilogger = { group = "no.nordicsemi.android.common", name = "uilogger", version.ref = "nordic-common" } -nordic-logger = { group = "no.nordicsemi.android.common", name = "logger", version.ref = "nordic-common" } -nordic-permissions-nfc = { group = "no.nordicsemi.android.common", name = "permissions-nfc", version.ref = "nordic-common" } -nordic-permissions-ble = { group = "no.nordicsemi.android.common", name = "permissions-ble", version.ref = "nordic-common" } -nordic-permissions-internet = { group = "no.nordicsemi.android.common", name = "permissions-internet", version.ref = "nordic-common" } -nordic-memfault = { group = "no.nordicsemi.android", name = "memfault", version.ref = "nordic-memfault" } - -# BleK -nordic-blek-client = { group = "no.nordicsemi.android.kotlin.ble", name = "client", version.ref = "nordic-blek" } -nordic-blek-server = { group = "no.nordicsemi.android.kotlin.ble", name = "server", version.ref = "nordic-blek" } -nordic-blek-profile = { group = "no.nordicsemi.android.kotlin.ble", name = "profile", version.ref = "nordic-blek" } -nordic-blek-core = { group = "no.nordicsemi.android.kotlin.ble", name = "core", version.ref = "nordic-blek" } -nordic-blek-scanner = { group = "no.nordicsemi.android.kotlin.ble", name = "scanner", version.ref = "nordic-blek" } -nordic-blek-advertiser = { group = "no.nordicsemi.android.kotlin.ble", name = "advertiser", version.ref = "nordic-blek" } -nordic-blek-uiscanner = { group = "no.nordicsemi.android.kotlin.ble", name = "uiscanner", version.ref = "nordic-blek" } - -# Dependencies of the included build-logic -android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } -kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } - -[plugins] -nordic-application = { id = "no.nordicsemi.android.gradle.application", version.ref = "nordicPlugins" } -nordic-application-compose = { id = "no.nordicsemi.android.gradle.application.compose", version.ref = "nordicPlugins" } -nordic-library = { id = "no.nordicsemi.android.gradle.library", version.ref = "nordicPlugins" } -nordic-library-compose = { id = "no.nordicsemi.android.gradle.library.compose", version.ref = "nordicPlugins" } -nordic-feature = { id = "no.nordicsemi.android.gradle.feature", version.ref = "nordicPlugins" } -nordic-hilt = { id = "no.nordicsemi.android.gradle.hilt", version.ref = "nordicPlugins" } -nordic-kotlin = { id = "no.nordicsemi.android.gradle.kotlin", version.ref = "nordicPlugins" } -nordic-nexus = { id = "no.nordicsemi.android.gradle.nexus", version.ref = "nordicPlugins" } -android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } -android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } -android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaPlugin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } -protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" } -secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" } -publish = { id = "com.gradle.plugin-publish", version.ref = "publishPlugin" } -wire = { id = "com.squareup.wire", version.ref = "wirePlugin" } -google-services = { id = "com.google.gms.google-services", version.ref = "googleServicesPlugins" } -firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugins" } diff --git a/profile_uart/build.gradle.kts b/profile_uart/build.gradle.kts index 11a568c9..bca8be56 100644 --- a/profile_uart/build.gradle.kts +++ b/profile_uart/build.gradle.kts @@ -81,7 +81,6 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.activity.compose) implementation(libs.androidx.lifecycle.service) - implementation(libs.okio) testImplementation(libs.hilt.android.testing) kaptTest(libs.hilt.compiler) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9a194bf5..64d771a4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,11 +48,11 @@ dependencyResolutionManagement { maven(url = "https://androidx.dev/storage/compose-compiler/repository/") maven(url = "https://jitpack.io") } -// versionCatalogs { -// create("libs") { -// from("no.nordicsemi.android.gradle:version-catalog:1.8.0") -// } -// } + versionCatalogs { + create("libs") { + from("no.nordicsemi.android.gradle:version-catalog:1.8.2") + } + } } rootProject.name = "Android-nRF-Toolbox"