From 0717f96041b921ae8aeadf124babbed796eb4ee8 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 16:31:53 +0100 Subject: [PATCH 1/6] Comment --- build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 8839c51d..a7f66685 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,6 +32,8 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.hilt) apply false + + // Nordic plugins are defined in https://github.com/NordicSemiconductor/Android-Gradle-Plugins alias(libs.plugins.nordic.application.compose) apply false alias(libs.plugins.nordic.library.compose) apply false alias(libs.plugins.nordic.feature) apply false From b1b63745cd773d52a98fa65ac8a201ab5aef6530 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 16:34:24 +0100 Subject: [PATCH 2/6] Old POM values removed --- gradle.properties | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 230c4a51..9cdd6fff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -74,17 +74,3 @@ android.defaults.buildfeatures.aidl=false android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false - -GROUP=no.nordicsemi.android.common - -POM_DESCRIPTION=Nordic Android Common Libraries -POM_URL=https://github.com/NordicPlayground/Android-Common-Libraries -POM_SCM_URL=https://github.com/NordicPlayground/Android-Common-Libraries -POM_SCM_CONNECTION=scm:git@github.com:NordicPlayground/Android-Common-Libraries.git -POM_SCM_DEV_CONNECTION=scm:git@github.com:NordicPlayground/Android-Common-Libraries.git -POM_LICENCE=BSD-3-Clause -POM_LICENCE_NAME=The BSD 3-Clause License -POM_LICENCE_URL=http://opensource.org/licenses/BSD-3-Clause -POM_DEVELOPER_ID=syzi -POM_DEVELOPER_NAME=Sylwester Zielinski -POM_DEVELOPER_EMAIL=sylwester.zielinski@nordicsemi.no From 80a30195fe63d8d425986a8d557ab1a442d46207 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 16:35:12 +0100 Subject: [PATCH 3/6] Custom BuildConfig fields enabled --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9cdd6fff..12062cb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -69,7 +69,6 @@ android.nonTransitiveRClass=true # Disable build features that are enabled by default, # https://developer.android.com/studio/releases/gradle-plugin#buildFeatures -android.defaults.buildfeatures.buildconfig=false android.defaults.buildfeatures.aidl=false android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false From b962edf844ace954524dcf88ce25b03d9522d3bb Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 16:38:29 +0100 Subject: [PATCH 4/6] Migration to Version Catalog 1.1.2 and Nordic plugins 1.1.1 --- analytics/build.gradle.kts | 5 ++++- core/build.gradle.kts | 5 ++++- navigation/build.gradle.kts | 5 ++++- permission/build.gradle.kts | 5 ++++- settings.gradle.kts | 2 +- theme/build.gradle.kts | 5 ++++- uilogger/build.gradle.kts | 5 ++++- uiscanner/build.gradle.kts | 5 ++++- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts index 88316664..078286b4 100644 --- a/analytics/build.gradle.kts +++ b/analytics/build.gradle.kts @@ -40,13 +40,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "analytics" POM_NAME = "Nordic library for analytics." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 5d9d6dd9..dafbbaf9 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -39,13 +39,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "core" POM_NAME = "Core Nordic common library." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index c5cfc5c8..8c018807 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -41,13 +41,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "navigation" POM_NAME = "Nordic library for navigation framework." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/permission/build.gradle.kts b/permission/build.gradle.kts index 1dbc9dcb..5d0bd63d 100644 --- a/permission/build.gradle.kts +++ b/permission/build.gradle.kts @@ -40,13 +40,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "permission" POM_NAME = "Nordic library for checking required permissions." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/settings.gradle.kts b/settings.gradle.kts index 6bc2afa8..3f5b0ab5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,7 +48,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("no.nordicsemi.android.gradle:version-catalog:1.0.16") + from("no.nordicsemi.android.gradle:version-catalog:1.1.2") } } } diff --git a/theme/build.gradle.kts b/theme/build.gradle.kts index 044cfb45..b9b85580 100644 --- a/theme/build.gradle.kts +++ b/theme/build.gradle.kts @@ -40,13 +40,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "theme" POM_NAME = "Nordic theme library for Android" - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/uilogger/build.gradle.kts b/uilogger/build.gradle.kts index d3d39da7..e6faf515 100644 --- a/uilogger/build.gradle.kts +++ b/uilogger/build.gradle.kts @@ -40,13 +40,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "uilogger" POM_NAME = "Nordic library for library for UI helpers utilizing nordic logger library." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { diff --git a/uiscanner/build.gradle.kts b/uiscanner/build.gradle.kts index e0940973..d996ce4f 100644 --- a/uiscanner/build.gradle.kts +++ b/uiscanner/build.gradle.kts @@ -40,13 +40,16 @@ group = "no.nordicsemi.android.common" nordicNexusPublishing { POM_ARTIFACT_ID = "uiscanner" POM_NAME = "Nordic library for Android with UI screens utilizing uiscanner library." - GROUP = "no.nordicsemi.android.common" POM_DESCRIPTION = "Nordic Android Common Libraries" POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries" POM_SCM_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" POM_SCM_DEV_CONNECTION = "scm:git@github.com:NordicPlayground/Android-Common-Libraries.git" + + POM_DEVELOPER_ID = "syzi" + POM_DEVELOPER_NAME = "Sylwester Zieliński" + POM_DEVELOPER_EMAIL = "sylwester.zielinski@nordicsemi.no" } android { From 1251ccf9998e7505c29670ca042d0fb0a6dbb4c5 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 17:02:41 +0100 Subject: [PATCH 5/6] Migration to Version Catalog 1.1.3 --- analytics/build.gradle.kts | 6 ------ core/build.gradle.kts | 6 ------ navigation/build.gradle.kts | 6 ------ permission/build.gradle.kts | 6 ------ settings.gradle.kts | 2 +- theme/build.gradle.kts | 6 ------ uilogger/build.gradle.kts | 6 ------ uiscanner/build.gradle.kts | 6 ------ 8 files changed, 1 insertion(+), 43 deletions(-) diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts index 078286b4..736fe501 100644 --- a/analytics/build.gradle.kts +++ b/analytics/build.gradle.kts @@ -54,12 +54,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.analytics" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index dafbbaf9..7352b030 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -53,12 +53,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.core" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index 8c018807..0fa2169c 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -55,12 +55,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.navigation" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/permission/build.gradle.kts b/permission/build.gradle.kts index 5d0bd63d..3ec17461 100644 --- a/permission/build.gradle.kts +++ b/permission/build.gradle.kts @@ -54,12 +54,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.permission" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index 3f5b0ab5..315f11ab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,7 +48,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("no.nordicsemi.android.gradle:version-catalog:1.1.2") + from("no.nordicsemi.android.gradle:version-catalog:1.1.3") } } } diff --git a/theme/build.gradle.kts b/theme/build.gradle.kts index b9b85580..6495b4df 100644 --- a/theme/build.gradle.kts +++ b/theme/build.gradle.kts @@ -54,12 +54,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.theme" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/uilogger/build.gradle.kts b/uilogger/build.gradle.kts index e6faf515..b620dd41 100644 --- a/uilogger/build.gradle.kts +++ b/uilogger/build.gradle.kts @@ -54,12 +54,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.ui.logger" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { diff --git a/uiscanner/build.gradle.kts b/uiscanner/build.gradle.kts index d996ce4f..b50c6680 100644 --- a/uiscanner/build.gradle.kts +++ b/uiscanner/build.gradle.kts @@ -54,12 +54,6 @@ nordicNexusPublishing { android { namespace = "no.nordicsemi.android.common.ui.scanner" - - buildTypes { - release { - isMinifyEnabled = false - } - } } dependencies { From 922cf8016eac387de63e73273c83a12d1faef368 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 16 Dec 2022 17:02:57 +0100 Subject: [PATCH 6/6] Modules proguard files added --- .../{analytics-rules.pro => module-rules.pro} | 0 ...core-proguard-rules.pro => module-rules.pro} | 0 ...tion-proguard-rules.pro => module-rules.pro} | 0 .../module-rules.pro | 0 .../module-rules.pro | 0 uilogger/module-rules.pro | 17 +++++++++++++++++ uiscanner/module-rules.pro | 17 +++++++++++++++++ 7 files changed, 34 insertions(+) rename analytics/{analytics-rules.pro => module-rules.pro} (100%) rename core/{core-proguard-rules.pro => module-rules.pro} (100%) rename navigation/{navigation-proguard-rules.pro => module-rules.pro} (100%) rename theme/theme-proguard-rules.pro => permission/module-rules.pro (100%) rename uiscanner/uiscanner-proguard-rules.pro => theme/module-rules.pro (100%) create mode 100644 uilogger/module-rules.pro create mode 100644 uiscanner/module-rules.pro diff --git a/analytics/analytics-rules.pro b/analytics/module-rules.pro similarity index 100% rename from analytics/analytics-rules.pro rename to analytics/module-rules.pro diff --git a/core/core-proguard-rules.pro b/core/module-rules.pro similarity index 100% rename from core/core-proguard-rules.pro rename to core/module-rules.pro diff --git a/navigation/navigation-proguard-rules.pro b/navigation/module-rules.pro similarity index 100% rename from navigation/navigation-proguard-rules.pro rename to navigation/module-rules.pro diff --git a/theme/theme-proguard-rules.pro b/permission/module-rules.pro similarity index 100% rename from theme/theme-proguard-rules.pro rename to permission/module-rules.pro diff --git a/uiscanner/uiscanner-proguard-rules.pro b/theme/module-rules.pro similarity index 100% rename from uiscanner/uiscanner-proguard-rules.pro rename to theme/module-rules.pro diff --git a/uilogger/module-rules.pro b/uilogger/module-rules.pro new file mode 100644 index 00000000..7e9d74c9 --- /dev/null +++ b/uilogger/module-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:/Users/alno/AppData/Local/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle.kts. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} \ No newline at end of file diff --git a/uiscanner/module-rules.pro b/uiscanner/module-rules.pro new file mode 100644 index 00000000..7e9d74c9 --- /dev/null +++ b/uiscanner/module-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:/Users/alno/AppData/Local/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle.kts. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} \ No newline at end of file