Skip to content
This repository was archived by the owner on Dec 18, 2022. It is now read-only.

Commit 2f1f73c

Browse files
05nelsonm05nelsonm
committed
update dokka and gradle maven publish to latest stable releases
1 parent efbd95e commit 2f1f73c

File tree

6 files changed

+117
-121
lines changed

6 files changed

+117
-121
lines changed

‎gradle/dependencies.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ ext.plugin = [
4747
androidGradle: "com.android.tools.build:gradle:7.0.3",
4848
gradleVersions: "com.github.ben-manes:gradle-versions-plugin:0.36.0",
4949
kotlin: [
50-
dokka: "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1",
50+
dokka: "org.jetbrains.dokka:dokka-gradle-plugin:${versions.kotlin}",
5151
gradle: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
5252
],
53-
mavenPublish: "com.vanniktech:gradle-maven-publish-plugin:0.14.2",
53+
mavenPublish: "com.vanniktech:gradle-maven-publish-plugin:0.18.0",
5454
]
5555

5656
/**

‎gradle/maven-publish.gradle‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ apply plugin: "com.vanniktech.maven.publish"
22

33
mavenPublish {
44
releaseSigningEnabled = true
5-
6-
targets {
7-
// Modify the existing uploadArchives task
8-
uploadArchives {
9-
releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
10-
snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
11-
}
12-
}
135
}
146

157
signing {

‎topl-core-base/build.gradle‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply from: rootProject.file('gradle/maven-publish.gradle')
43

54
android {
65
compileSdkVersion versions.compileSdk
@@ -34,24 +33,24 @@ android {
3433
}
3534
}
3635

37-
dokka {
38-
configuration {
39-
moduleName = 'topl-core-base'
40-
reportUndocumented = false
41-
includeNonPublic = false
42-
skipEmptyPackages = true
43-
samples = [
44-
"$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/CodeSamples.kt".toString(),
45-
"$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/components/onionproxy/ServiceEventBroadcaster.kt".toString()
46-
]
47-
sourceLink {
48-
url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
49-
lineSuffix = "#L"
50-
}
51-
}
52-
outputFormat = 'gfm'
53-
outputDirectory = "$rootDir/docs/"
54-
}
36+
//dokka {
37+
// configuration {
38+
// moduleName = 'topl-core-base'
39+
// reportUndocumented = false
40+
// includeNonPublic = false
41+
// skipEmptyPackages = true
42+
// samples = [
43+
// "$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/CodeSamples.kt".toString(),
44+
// "$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/components/onionproxy/ServiceEventBroadcaster.kt".toString()
45+
// ]
46+
// sourceLink {
47+
// url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
48+
// lineSuffix = "#L"
49+
// }
50+
// }
51+
// outputFormat = 'gfm'
52+
// outputDirectory = "$rootDir/docs/"
53+
//}
5554

5655
dependencies {
5756
implementation fileTree(dir: "libs", include: ["*.jar"])
@@ -63,4 +62,6 @@ dependencies {
6362
androidTestImplementation testDeps.androidx.core
6463
androidTestImplementation testDeps.androidx.junit
6564
androidTestImplementation testDeps.androidx.espresso
66-
}
65+
}
66+
67+
apply from: rootProject.file('gradle/maven-publish.gradle')

‎topl-core/build.gradle‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply from: rootProject.file('gradle/maven-publish.gradle')
43

54
android {
65
compileSdkVersion versions.compileSdk
@@ -35,31 +34,31 @@ android {
3534
}
3635
}
3736

38-
dokka {
39-
configuration {
40-
moduleName = 'topl-core'
41-
subProjects = [ 'topl-core-base' ]
42-
reportUndocumented = false
43-
includeNonPublic = false
44-
skipEmptyPackages = true
45-
samples = [
46-
"$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/TorService.kt".toString(),
47-
"$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/components/onionproxy/ServiceTorInstaller.kt".toString()
48-
]
49-
sourceLink {
50-
url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
51-
lineSuffix = "#L"
52-
}
53-
externalDocumentationLink {
54-
// Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
55-
// links after building the docs by running `./gradlew fixDokkaDocLinks`.
56-
url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
57-
packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
58-
}
59-
}
60-
outputFormat = 'gfm'
61-
outputDirectory = "$rootDir/docs/"
62-
}
37+
//dokka {
38+
// configuration {
39+
// moduleName = 'topl-core'
40+
// subProjects = [ 'topl-core-base' ]
41+
// reportUndocumented = false
42+
// includeNonPublic = false
43+
// skipEmptyPackages = true
44+
// samples = [
45+
// "$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/TorService.kt".toString(),
46+
// "$rootDir/topl-service/src/main/java/io/matthewnelson/topl_service/service/components/onionproxy/ServiceTorInstaller.kt".toString()
47+
// ]
48+
// sourceLink {
49+
// url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
50+
// lineSuffix = "#L"
51+
// }
52+
// externalDocumentationLink {
53+
// // Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
54+
// // links after building the docs by running `./gradlew fixDokkaDocLinks`.
55+
// url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
56+
// packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
57+
// }
58+
// }
59+
// outputFormat = 'gfm'
60+
// outputDirectory = "$rootDir/docs/"
61+
//}
6362

6463
dependencies {
6564
implementation fileTree(dir: "libs", include: ["*.jar"])
@@ -79,3 +78,5 @@ dependencies {
7978
androidTestImplementation testDeps.androidx.espresso
8079
androidTestImplementation testDeps.androidx.junit
8180
}
81+
82+
apply from: rootProject.file('gradle/maven-publish.gradle')

‎topl-service-base/build.gradle‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply from: rootProject.file('gradle/maven-publish.gradle')
43

54
android {
65
compileSdkVersion versions.compileSdk
@@ -38,31 +37,31 @@ android {
3837
}
3938
}
4039

41-
dokka {
42-
configuration {
43-
moduleName = 'topl-service-base'
44-
subProjects = [ 'topl-core-base' ]
45-
reportUndocumented = false
46-
includeNonPublic = false
47-
skipEmptyPackages = true
48-
samples = [
49-
"$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/MyServiceExecutionHooks.kt".toString(),
50-
"$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/MyEventBroadcaster.kt".toString()
51-
]
52-
sourceLink {
53-
url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
54-
lineSuffix = "#L"
55-
}
56-
externalDocumentationLink {
57-
// Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
58-
// links after building the docs by running `./gradlew fixDokkaDocLinks`.
59-
url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
60-
packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
61-
}
62-
}
63-
outputFormat = 'gfm'
64-
outputDirectory = "$rootDir/docs/"
65-
}
40+
//dokka {
41+
// configuration {
42+
// moduleName = 'topl-service-base'
43+
// subProjects = [ 'topl-core-base' ]
44+
// reportUndocumented = false
45+
// includeNonPublic = false
46+
// skipEmptyPackages = true
47+
// samples = [
48+
// "$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/MyServiceExecutionHooks.kt".toString(),
49+
// "$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/MyEventBroadcaster.kt".toString()
50+
// ]
51+
// sourceLink {
52+
// url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
53+
// lineSuffix = "#L"
54+
// }
55+
// externalDocumentationLink {
56+
// // Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
57+
// // links after building the docs by running `./gradlew fixDokkaDocLinks`.
58+
// url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
59+
// packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
60+
// }
61+
// }
62+
// outputFormat = 'gfm'
63+
// outputDirectory = "$rootDir/docs/"
64+
//}
6665

6766
dependencies {
6867
implementation fileTree(dir: "libs", include: ["*.jar"])
@@ -73,4 +72,6 @@ dependencies {
7372
testImplementation testDeps.androidx.core
7473
testImplementation testDeps.junit
7574
testImplementation testDeps.robolectric
76-
}
75+
}
76+
77+
apply from: rootProject.file('gradle/maven-publish.gradle')

‎topl-service/build.gradle‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply from: rootProject.file('gradle/maven-publish.gradle')
43

54
android {
65
compileSdkVersion versions.compileSdk
@@ -39,42 +38,42 @@ android {
3938
}
4039
}
4140

42-
dokka {
43-
configuration {
44-
moduleName = 'topl-service'
45-
subProjects = [ 'topl-core-base', 'topl-service-base', 'topl-core' ]
46-
reportUndocumented = false
47-
includeNonPublic = false
48-
skipEmptyPackages = true
49-
samples = [
50-
"$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/CodeSamples.kt".toString()
51-
]
52-
sourceLink {
53-
url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
54-
lineSuffix = "#L"
55-
}
56-
externalDocumentationLink {
57-
// Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
58-
// links after building the docs by running `./gradlew fixDokkaDocLinks`.
59-
url = new URL("http://FIX_DOKKA_LINKS/topl-service-base/")
60-
packageListUrl = new URL("file://$rootDir/docs/topl-service-base/package-list")
61-
}
62-
externalDocumentationLink {
63-
// Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
64-
// links after building the docs by running `./gradlew fixDokkaDocLinks`.
65-
url = new URL("http://FIX_DOKKA_LINKS/topl-core/")
66-
packageListUrl = new URL("file://$rootDir/docs/topl-core/package-list")
67-
}
68-
externalDocumentationLink {
69-
// Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
70-
// links after building the docs by running `./gradlew fixDokkaDocLinks`.
71-
url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
72-
packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
73-
}
74-
}
75-
outputFormat = 'gfm'
76-
outputDirectory = "$rootDir/docs/"
77-
}
41+
//dokka {
42+
// configuration {
43+
// moduleName = 'topl-service'
44+
// subProjects = [ 'topl-core-base', 'topl-service-base', 'topl-core' ]
45+
// reportUndocumented = false
46+
// includeNonPublic = false
47+
// skipEmptyPackages = true
48+
// samples = [
49+
// "$rootDir/sampleapp/src/main/java/io/matthewnelson/sampleapp/topl_android/CodeSamples.kt".toString()
50+
// ]
51+
// sourceLink {
52+
// url = "https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/"
53+
// lineSuffix = "#L"
54+
// }
55+
// externalDocumentationLink {
56+
// // Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
57+
// // links after building the docs by running `./gradlew fixDokkaDocLinks`.
58+
// url = new URL("http://FIX_DOKKA_LINKS/topl-service-base/")
59+
// packageListUrl = new URL("file://$rootDir/docs/topl-service-base/package-list")
60+
// }
61+
// externalDocumentationLink {
62+
// // Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
63+
// // links after building the docs by running `./gradlew fixDokkaDocLinks`.
64+
// url = new URL("http://FIX_DOKKA_LINKS/topl-core/")
65+
// packageListUrl = new URL("file://$rootDir/docs/topl-core/package-list")
66+
// }
67+
// externalDocumentationLink {
68+
// // Dokka plugin requires a protocol (http/https/etc.) here, so we have to repair the
69+
// // links after building the docs by running `./gradlew fixDokkaDocLinks`.
70+
// url = new URL("http://FIX_DOKKA_LINKS/topl-core-base/")
71+
// packageListUrl = new URL("file://$rootDir/docs/topl-core-base/package-list")
72+
// }
73+
// }
74+
// outputFormat = 'gfm'
75+
// outputDirectory = "$rootDir/docs/"
76+
//}
7877

7978
dependencies {
8079
implementation fileTree(dir: "libs", include: ["*.jar"])
@@ -96,4 +95,6 @@ dependencies {
9695
androidTestImplementation testDeps.androidx.core
9796
androidTestImplementation testDeps.androidx.espresso
9897
androidTestImplementation testDeps.androidx.junit
99-
}
98+
}
99+
100+
apply from: rootProject.file('gradle/maven-publish.gradle')

0 commit comments

Comments
 (0)