From 3ed65211f79fba0584ecdf0785f77e38599a4075 Mon Sep 17 00:00:00 2001 From: bdqsky Date: Sat, 22 Feb 2020 19:55:38 +0800 Subject: [PATCH] update gradle config --- build.gradle | 46 +++++++++++++------ festival-aop/build.gradle | 10 ++++ festival-cache/build.gradle | 19 ++++---- festival-context/build.gradle | 10 ++++ festival-core/build.gradle | 10 ++++ festival-kotlin-web/build.gradle | 15 +++--- .../cn/bdqfork/kotlin/web/annotation/Auth.kt | 2 +- .../kotlin/web/annotation/VerticleMapping.kt | 2 +- .../kotlin/web/route/annotation/PutMapping.kt | 2 +- .../web/route/annotation/RouteController.kt | 2 +- .../web/route/annotation/RouteMapping.kt | 2 +- .../web/route/annotation/ServerEndpoint.kt | 2 +- festival-web/build.gradle | 10 ++++ 13 files changed, 95 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 6a43bcc..f77bd27 100644 --- a/build.gradle +++ b/build.gradle @@ -18,16 +18,20 @@ ext { buildscript { ext.kotlin_version = '1.3.61' ext.shadow_version = '5.2.0' + ext.dokka_version = '0.10.1' repositories { - mavenCentral() maven { - url "https://plugins.gradle.org/m2/" + url 'http://maven.aliyun.com/nexus/content/groups/public/' + } + maven { + url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.github.jengelman.gradle.plugins:shadow:$shadow_version" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" } } @@ -37,14 +41,19 @@ allprojects { } subprojects { + apply plugin: 'kotlin' apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'signing' + apply plugin: 'org.jetbrains.dokka' repositories { mavenLocal() maven { - url = 'http://repo.maven.apache.org/maven2' + url 'http://maven.aliyun.com/nexus/content/groups/public/' + } + maven { + url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } } @@ -58,31 +67,38 @@ subprojects { sourceCompatibility = '1.8' targetCompatibility = '1.8' - task sourcesJar(type: Jar) { - from sourceSets.main.allJava + compileKotlin { + kotlinOptions.jvmTarget = "1.8" + } + compileTestKotlin { + kotlinOptions.jvmTarget = "1.8" + } + + task generateSourcesJar(type: Jar) { + group = 'jar' + from sourceSets.main.java.srcDirs classifier = 'sources' } - task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' + task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { + outputFormat = "javadoc" + outputDirectory = javadoc.destinationDir } - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - options.addStringOption('encoding', 'UTF-8') - options.addStringOption('charSet', 'UTF-8') + task generateJavadoc(type: Jar, dependsOn: dokkaJavadoc) { + group = 'jar' + classifier = 'javadoc' + from javadoc.destinationDir } publishing { publications { mavenJava(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar + artifact generateSourcesJar + artifact generateJavadoc pom { name = project.name - description = project.name url = 'https://github.com/bdqfork/festival' licenses { license { diff --git a/festival-aop/build.gradle b/festival-aop/build.gradle index d9378d6..1ebf44a 100644 --- a/festival-aop/build.gradle +++ b/festival-aop/build.gradle @@ -6,3 +6,13 @@ dependencies { api "org.aspectj:aspectjweaver:${libs.aspectjweaver}" implementation project(':festival-context') } + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'Aop extension for festival context!' + } + } + } +} \ No newline at end of file diff --git a/festival-cache/build.gradle b/festival-cache/build.gradle index 2acde6c..18a0ffb 100644 --- a/festival-cache/build.gradle +++ b/festival-cache/build.gradle @@ -1,5 +1,3 @@ -apply plugin: 'kotlin' - def libs = rootProject.ext.libraries dependencies { @@ -8,13 +6,6 @@ dependencies { implementation project(':festival-context') } -compileKotlin { - kotlinOptions.jvmTarget = "1.8" -} -compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" -} - tasks.withType(PublishToMavenRepository) { onlyIf { false @@ -24,4 +15,14 @@ tasks.withType(PublishToMavenLocal) { onlyIf { false } +} + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'Cache extension for festival context!' + } + } + } } \ No newline at end of file diff --git a/festival-context/build.gradle b/festival-context/build.gradle index 6c7ca64..9d38dfa 100644 --- a/festival-context/build.gradle +++ b/festival-context/build.gradle @@ -7,3 +7,13 @@ dependencies { api project(':festival-core') testImplementation project(':festival-aop') } + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'Application context based on festival core!' + } + } + } +} \ No newline at end of file diff --git a/festival-core/build.gradle b/festival-core/build.gradle index bd0cbb2..98b7534 100644 --- a/festival-core/build.gradle +++ b/festival-core/build.gradle @@ -3,4 +3,14 @@ def libs = rootProject.ext.libraries dependencies { api "javax.inject:javax.inject:${libs.jsr330}" implementation "org.javassist:javassist:${libs.javassist}" +} + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'IoC core factories!' + } + } + } } \ No newline at end of file diff --git a/festival-kotlin-web/build.gradle b/festival-kotlin-web/build.gradle index 497364d..228434f 100644 --- a/festival-kotlin-web/build.gradle +++ b/festival-kotlin-web/build.gradle @@ -1,5 +1,3 @@ -apply plugin: 'kotlin' - def libs = rootProject.ext.libraries dependencies { @@ -15,9 +13,12 @@ dependencies { api project(':festival-context') } -compileKotlin { - kotlinOptions.jvmTarget = "1.8" -} -compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'A kotlin web framework based vertx!' + } + } + } } \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/Auth.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/Auth.kt index 130e6cc..6c6bc1d 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/Auth.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/Auth.kt @@ -8,5 +8,5 @@ package cn.bdqfork.kotlin.web.annotation */ @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) annotation class Auth \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/VerticleMapping.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/VerticleMapping.kt index fe32e04..f517be0 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/VerticleMapping.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/annotation/VerticleMapping.kt @@ -13,5 +13,5 @@ import javax.inject.Singleton @Named @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS) +@Target(AnnotationTarget.CLASS) annotation class VerticleMapping(val value: String = "") \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/PutMapping.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/PutMapping.kt index 978ffac..100f7e3 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/PutMapping.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/PutMapping.kt @@ -12,5 +12,5 @@ import io.vertx.ext.web.handler.TimeoutHandler @RouteMapping(method = HttpMethod.PUT) @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.FUNCTION) annotation class PutMapping(val value: String, val timeout: Long = TimeoutHandler.DEFAULT_TIMEOUT) \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteController.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteController.kt index 566be0c..ce540e8 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteController.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteController.kt @@ -12,5 +12,5 @@ import javax.inject.Named @RouteMapping @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS) +@Target(AnnotationTarget.CLASS) annotation class RouteController(val value: String = "") \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteMapping.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteMapping.kt index e1d0273..feeb71a 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteMapping.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/RouteMapping.kt @@ -11,5 +11,5 @@ import io.vertx.ext.web.handler.TimeoutHandler */ @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION) annotation class RouteMapping(val value: String = "", val method: HttpMethod = HttpMethod.OPTIONS, val timeout: Long = TimeoutHandler.DEFAULT_TIMEOUT) \ No newline at end of file diff --git a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/ServerEndpoint.kt b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/ServerEndpoint.kt index adc71bb..b7d7ca1 100644 --- a/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/ServerEndpoint.kt +++ b/festival-kotlin-web/src/main/kotlin/cn/bdqfork/kotlin/web/route/annotation/ServerEndpoint.kt @@ -6,5 +6,5 @@ package cn.bdqfork.kotlin.web.route.annotation */ @MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS) +@Target(AnnotationTarget.CLASS) annotation class ServerEndpoint(val value: String) \ No newline at end of file diff --git a/festival-web/build.gradle b/festival-web/build.gradle index a6a4de3..02ec2bd 100644 --- a/festival-web/build.gradle +++ b/festival-web/build.gradle @@ -10,4 +10,14 @@ dependencies { api "io.vertx:vertx-web:${libs.vertx}" api "io.vertx:vertx-rx-java2:${libs.vertx}" api project(':festival-context') +} + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + description = 'A web framework based vertx!' + } + } + } } \ No newline at end of file