Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration to Kotlin scripts #75

Merged
merged 3 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-to-play-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
fetch-depth: 0
- shell: bash
env:
# The following env variables are used by signing configuration in sample/build.gradle
# The following env variables are used by signing configuration
KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
KEYSTORE_KEY_PSWD: ${{ secrets.KEYSTORE_KEY_PSWD }}
KEYSTORE_PSWD: ${{ secrets.KEYSTORE_PSWD }}
# The script decodes keystore (required by sample/build.gradle) and fastlane-api.json
# The script decodes keystore (required by the app signing conf) and fastlane-api.json
# needed by fastlane (see fastlane/Appfile).
run: |
echo "${{ secrets.KEYSTORE_FILE }}" > keystore.asc
Expand Down
84 changes: 0 additions & 84 deletions app/build.gradle

This file was deleted.

27 changes: 27 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.nordic.application)
alias(libs.plugins.nordic.application.compose)
alias(libs.plugins.nordic.hilt)
}

android {
namespace = "no.nordicsemi.android.blinky"
defaultConfig {
resourceConfigurations.add("en")
}
}

dependencies {
implementation(project(":scanner"))
implementation(project(":blinky:spec"))
implementation(project(":blinky:ui"))
implementation(project(":blinky:ble"))

implementation(libs.nordic.theme)
implementation(libs.nordic.navigation)

implementation(libs.timber)

implementation(libs.androidx.activity.compose)
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
26 changes: 0 additions & 26 deletions blinky/ble/build.gradle

This file was deleted.

18 changes: 18 additions & 0 deletions blinky/ble/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
plugins {
alias(libs.plugins.nordic.library)
}

android {
namespace = "no.nordicsemi.android.blinky.transport_ble"
}

dependencies {
implementation(project(":blinky:spec"))

// Import BLE Library
implementation(libs.nordic.ble.ktx)
// BLE events are logged using Timber
implementation(libs.timber)
// Coroutines
implementation(libs.kotlinx.coroutines.core)
}
20 changes: 0 additions & 20 deletions blinky/spec/build.gradle

This file was deleted.

12 changes: 12 additions & 0 deletions blinky/spec/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
plugins {
alias(libs.plugins.nordic.library)
}

android {
namespace = "no.nordicsemi.android.blinky.spec"
}

dependencies {
// Coroutines
implementation(libs.kotlinx.coroutines.core)
}
64 changes: 0 additions & 64 deletions blinky/ui/build.gradle

This file was deleted.

21 changes: 21 additions & 0 deletions blinky/ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
plugins {
alias(libs.plugins.nordic.feature)
id("kotlin-parcelize")
}

android {
namespace = "no.nordicsemi.android.blinky.control"
}

dependencies {
implementation(project(":blinky:spec"))

implementation(libs.nordic.theme)
implementation(libs.nordic.uilogger)
implementation(libs.nordic.uiscanner)
implementation(libs.nordic.navigation)
implementation(libs.nordic.permission)

implementation(libs.androidx.compose.material.iconsExtended)
implementation(libs.nordic.log.timber)
}
18 changes: 0 additions & 18 deletions build.gradle

This file was deleted.

12 changes: 12 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.nordic.application) apply false
alias(libs.plugins.nordic.application.compose) apply false
alias(libs.plugins.nordic.library) apply false
alias(libs.plugins.nordic.library.compose) apply false
alias(libs.plugins.nordic.feature) apply false
alias(libs.plugins.nordic.hilt) apply false
}
52 changes: 0 additions & 52 deletions scanner/build.gradle

This file was deleted.

Loading