From fbc3781d500bcd7591420150e2b96c91f6082a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 22 Apr 2018 17:26:54 +0200 Subject: [PATCH 1/3] Update build.gradle.mustache creating javadoc and source jar fieles --- .../src/main/resources/Java/build.gradle.mustache | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache index af0d3d55d85..ce4c21d0a40 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -18,6 +18,20 @@ repositories { jcenter() } +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar +} if(hasProperty('target') && target == 'android') { @@ -135,3 +149,4 @@ dependencies { {{/java8}} testCompile "junit:junit:$junit_version" } + From 4fd1b294a102969b1818058c566b44dd9055916f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 22 Apr 2018 17:29:58 +0200 Subject: [PATCH 2/3] Update build.gradle.mustache --- .../main/resources/Java/build.gradle.mustache | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache index ce4c21d0a40..a48f4a46a0d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -18,20 +18,7 @@ repositories { jcenter() } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives sourcesJar - archives javadocJar -} if(hasProperty('target') && target == 'android') { @@ -117,6 +104,21 @@ if(hasProperty('target') && target == 'android') { main = System.getProperty('mainClass') classpath = sourceSets.main.runtimeClasspath } + + task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir + } + + artifacts { + archives sourcesJar + archives javadocJar + } } ext { From b0c88c47d54df24c52902315e0ce200f46c68050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 23 Apr 2018 16:48:51 +0200 Subject: [PATCH 3/3] Update build.gradle.mustache --- .../src/main/resources/Java/build.gradle.mustache | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache index a48f4a46a0d..575811da812 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -18,8 +18,6 @@ repositories { jcenter() } - - if(hasProperty('target') && target == 'android') { apply plugin: 'com.android.library'