Skip to content

Commit 70f5e2b

Browse files
authored
Merge pull request #487 from NordicSemiconductor/migration/agp2.6
Migration to Dokka 2
2 parents 03d7c58 + a5fd368 commit 70f5e2b

File tree

417 files changed

+37992
-31556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+37992
-31556
lines changed

.github/workflows/deploy-all.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
fetch-depth: 0
1515
- uses: actions/setup-java@v4
1616
with:
17-
distribution: 'corretto'
18-
java-version: '17'
17+
distribution: 'jetbrains'
18+
java-version: '21'
1919
- shell: bash
2020
# The script gets VERSION from the latest tag and replaces {{VERSION}} with it in
2121
# moustache/README.mo. Then, it commits the change using GitHub Action user.
@@ -38,8 +38,8 @@ jobs:
3838
fetch-depth: 0
3939
- uses: actions/setup-java@v4
4040
with:
41-
distribution: 'corretto'
42-
java-version: '17'
41+
distribution: 'jetbrains'
42+
java-version: '21'
4343
- shell: bash
4444
env:
4545
# The following env variables are used by Nexus plugin
@@ -62,8 +62,8 @@ jobs:
6262
fetch-depth: 0
6363
- uses: actions/setup-java@v4
6464
with:
65-
distribution: 'corretto'
66-
java-version: '17'
65+
distribution: 'jetbrains'
66+
java-version: '21'
6767
- shell: bash
6868
env:
6969
KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}

.github/workflows/deploy-to-nexus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
fetch-depth: 0
1111
- uses: actions/setup-java@v4
1212
with:
13-
distribution: 'corretto'
14-
java-version: '17'
13+
distribution: 'jetbrains'
14+
java-version: '21'
1515
- shell: bash
1616
env:
1717
# The following env variables are used by Nexus plugin

.github/workflows/deploy-to-play-store.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
fetch-depth: 0
1111
- uses: actions/setup-java@v4
1212
with:
13-
distribution: 'corretto'
14-
java-version: '17'
13+
distribution: 'jetbrains'
14+
java-version: '21'
1515
- shell: bash
1616
env:
1717
KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}

.github/workflows/generate-readme.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
fetch-depth: 0
1111
- uses: actions/setup-java@v4
1212
with:
13-
distribution: 'corretto'
14-
java-version: '17'
13+
distribution: 'jetbrains'
14+
java-version: '21'
1515
- shell: bash
1616
# The script gets VERSION from the latest tag and replaces {{VERSION}} with it in
1717
# moustache/README.mo. Then, it commits the change using GitHub Action user.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ It is compatible with all Bootloader/DFU versions.
123123

124124
See the [documentation](documentation) for more information.
125125

126+
API documentation is located [here](https://nordicsemiconductor.github.io/Android-DFU-Library/html/index.html).
127+
126128
## Requirements
127129

128130
The library is compatible with nRF51 and nRF52 devices with S-Series Soft Device and the

build.gradle.kts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
plugins {
22
alias(libs.plugins.android.application) apply false
33
alias(libs.plugins.kotlin.parcelize) apply false
4-
alias(libs.plugins.kotlin.dokka) apply false
54
alias(libs.plugins.hilt) apply false
65
alias(libs.plugins.compose.compiler) apply false
76

87
// Nordic plugins are defined in https://github.com/NordicSemiconductor/Android-Gradle-Plugins
9-
alias(libs.plugins.nordic.application) apply false
108
alias(libs.plugins.nordic.application.compose) apply false
119
alias(libs.plugins.nordic.library) apply false
1210
alias(libs.plugins.nordic.library.compose) apply false
@@ -15,6 +13,19 @@ plugins {
1513
alias(libs.plugins.nordic.hilt) apply false
1614
alias(libs.plugins.nordic.nexus.android) apply false
1715

16+
// This plugin is used to generate Dokka documentation.
17+
alias(libs.plugins.kotlin.dokka) apply false
18+
// This applies Nordic look & feel to generated Dokka documentation.
19+
// https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/NordicDokkaPlugin.kt
20+
alias(libs.plugins.nordic.dokka) apply true
21+
1822
alias(libs.plugins.google.services) apply false
1923
alias(libs.plugins.firebase.crashlytics) apply false
24+
}
25+
26+
// Configure main Dokka page
27+
dokka {
28+
pluginsConfiguration.html {
29+
homepageLink.set("https://github.com/NordicSemiconductor/Android-DFU-Library")
30+
}
2031
}
Lines changed: 4 additions & 0 deletions
Loading

docs/html/images/copy-icon.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)