From 0b497c1b87d45915d20b60b81367ca03ad7f0bd9 Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Fri, 20 Jan 2023 09:53:26 +0100 Subject: [PATCH] Change parcelize to serialization plugin --- lib_service/build.gradle.kts | 2 +- lib_utils/build.gradle.kts | 2 +- library.gradle | 59 ----------------------------------- profile_bps/build.gradle.kts | 2 +- profile_cgms/build.gradle.kts | 2 +- profile_csc/build.gradle.kts | 2 +- profile_gls/build.gradle.kts | 2 +- profile_hrs/build.gradle.kts | 2 +- profile_hts/build.gradle.kts | 2 +- profile_prx/build.gradle.kts | 2 +- profile_rscs/build.gradle.kts | 2 +- profile_uart/build.gradle.kts | 2 +- settings.gradle.kts | 1 + 13 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 library.gradle diff --git a/lib_service/build.gradle.kts b/lib_service/build.gradle.kts index 12f4709b..5c1c3ee1 100644 --- a/lib_service/build.gradle.kts +++ b/lib_service/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/lib_utils/build.gradle.kts b/lib_utils/build.gradle.kts index 0e5490fb..979ea938 100644 --- a/lib_utils/build.gradle.kts +++ b/lib_utils/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/library.gradle b/library.gradle deleted file mode 100644 index fb024bb9..00000000 --- a/library.gradle +++ /dev/null @@ -1,59 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'dagger.hilt.android.plugin' -apply plugin: 'kotlin-kapt' - -android { - compileSdk android_api_version - - defaultConfig { - minSdk android_min_api_version - targetSdk android_api_version - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - /** - * There is an issue with recomposition performance when data objects doesn't belong to the module - * when composition is enabled, because those objects cannot be properly compared for the changes. - * Better to leave enabled for all modules. - */ - composeOptions { - kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion kotlin_version - } - - buildFeatures { - compose true - } - - hilt { - enableExperimentalClasspathAggregation = true - } -} - -dependencies { - implementation libs.bundles.compose - - implementation libs.bundles.hilt - kapt libs.bundles.hiltkapt -} diff --git a/profile_bps/build.gradle.kts b/profile_bps/build.gradle.kts index 47455844..e6228d36 100644 --- a/profile_bps/build.gradle.kts +++ b/profile_bps/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_cgms/build.gradle.kts b/profile_cgms/build.gradle.kts index 35413731..a462d51b 100644 --- a/profile_cgms/build.gradle.kts +++ b/profile_cgms/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_csc/build.gradle.kts b/profile_csc/build.gradle.kts index ba3678b7..8f010e4c 100644 --- a/profile_csc/build.gradle.kts +++ b/profile_csc/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_gls/build.gradle.kts b/profile_gls/build.gradle.kts index 182addfd..cfd2ed32 100644 --- a/profile_gls/build.gradle.kts +++ b/profile_gls/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_hrs/build.gradle.kts b/profile_hrs/build.gradle.kts index 090e9490..0af85b14 100644 --- a/profile_hrs/build.gradle.kts +++ b/profile_hrs/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_hts/build.gradle.kts b/profile_hts/build.gradle.kts index 8ad714a8..acdcef3c 100644 --- a/profile_hts/build.gradle.kts +++ b/profile_hts/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_prx/build.gradle.kts b/profile_prx/build.gradle.kts index b1d27ca1..245f6496 100644 --- a/profile_prx/build.gradle.kts +++ b/profile_prx/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_rscs/build.gradle.kts b/profile_rscs/build.gradle.kts index e7e78129..6b409008 100644 --- a/profile_rscs/build.gradle.kts +++ b/profile_rscs/build.gradle.kts @@ -31,7 +31,7 @@ plugins { alias(libs.plugins.nordic.library) - id("kotlin-parcelize") + alias(libs.plugins.kotlin.serialization) } android { diff --git a/profile_uart/build.gradle.kts b/profile_uart/build.gradle.kts index 744931a5..d8304e4a 100644 --- a/profile_uart/build.gradle.kts +++ b/profile_uart/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation(libs.room.ktx) // kapt(libs.room.compiler) - kapt("androidx.room:room-compiler:2.5.0") +// kapt("androidx.room:room-compiler:2.5.0") // kapt("") implementation(libs.nordic.ble.common) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9addc940..ebf82a29 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -44,6 +44,7 @@ dependencyResolutionManagement { mavenLocal() google() mavenCentral() + gradlePluginPortal() maven(url = "https://jitpack.io") } versionCatalogs {