Merge pull request #30 from NordicPlayground/migration/nexus

Migration to Nordic Plugins 1.1.3
NordicPlayground · Dec 16, 2022 · 36cb841 · 36cb841
2 parents d8e6062 + 922cf80
commit 36cb841
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 65 deletions.
diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts
@@ -40,23 +40,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.analytics"
-
-     buildTypes {
-         release {
-             isMinifyEnabled = false
-         }
-     }
 }
 
 dependencies {

diff --git a/analytics/analytics-rules.pro → analytics/module-rules.pro b/analytics/analytics-rules.pro → analytics/module-rules.pro
diff --git 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

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -39,23 +39,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.core"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/core/core-proguard-rules.pro → core/module-rules.pro b/core/core-proguard-rules.pro → core/module-rules.pro
diff --git a/gradle.properties b/gradle.properties
@@ -69,22 +69,7 @@ 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
 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:[email protected]:NordicPlayground/Android-Common-Libraries.git
-POM_SCM_DEV_CONNECTION=scm:[email protected]: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=[email protected]
diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts
@@ -41,23 +41,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.navigation"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/navigation/navigation-proguard-rules.pro → navigation/module-rules.pro b/navigation/navigation-proguard-rules.pro → navigation/module-rules.pro
diff --git a/permission/build.gradle.kts b/permission/build.gradle.kts
@@ -40,23 +40,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.permission"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/theme/theme-proguard-rules.pro → permission/module-rules.pro b/theme/theme-proguard-rules.pro → permission/module-rules.pro
diff --git 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.3")
         }
     }
 }

diff --git a/theme/build.gradle.kts b/theme/build.gradle.kts
@@ -40,23 +40,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.theme"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/uiscanner/uiscanner-proguard-rules.pro → theme/module-rules.pro b/uiscanner/uiscanner-proguard-rules.pro → theme/module-rules.pro
diff --git a/uilogger/build.gradle.kts b/uilogger/build.gradle.kts
@@ -40,23 +40,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.ui.logger"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/uilogger/module-rules.pro 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 *;
+#}
diff --git a/uiscanner/build.gradle.kts b/uiscanner/build.gradle.kts
@@ -40,23 +40,20 @@ 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:[email protected]:NordicPlayground/Android-Common-Libraries.git"
     POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+
+    POM_DEVELOPER_ID = "syzi"
+    POM_DEVELOPER_NAME = "Sylwester Zieliński"
+    POM_DEVELOPER_EMAIL = "[email protected]"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.ui.scanner"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
 }
 
 dependencies {

diff --git a/uiscanner/module-rules.pro 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 *;
+#}