Skip to content

Commit

Permalink
Merge pull request #30 from NordicPlayground/migration/nexus
Browse files Browse the repository at this point in the history
Migration to Nordic Plugins 1.1.3
philips77 authored Dec 16, 2022

Verified

This commit was signed with the committer’s verified signature.
addaleax Anna Henningsen
2 parents d8e6062 + 922cf80 commit 36cb841
Showing 17 changed files with 65 additions and 65 deletions.
11 changes: 4 additions & 7 deletions analytics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
File renamed without changes.
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
11 changes: 4 additions & 7 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
File renamed without changes.
15 changes: 0 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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]
11 changes: 4 additions & 7 deletions navigation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
File renamed without changes.
11 changes: 4 additions & 7 deletions permission/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
}
}
11 changes: 4 additions & 7 deletions theme/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
File renamed without changes.
11 changes: 4 additions & 7 deletions uilogger/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
17 changes: 17 additions & 0 deletions uilogger/module-rules.pro
Original file line number Diff line number Diff line change
@@ -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 *;
#}
11 changes: 4 additions & 7 deletions uiscanner/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
17 changes: 17 additions & 0 deletions uiscanner/module-rules.pro
Original file line number Diff line number Diff line change
@@ -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 *;
#}

0 comments on commit 36cb841

Please sign in to comment.