From f685175285d48ba683d768a63cd6f2d0a4907b41 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 27 Nov 2020 11:26:04 +0600 Subject: [PATCH] remove redundant publishing scripts and change variables related to version and group --- core/api/publish.gradle | 76 -------------------------- core/api/publish_config.kpsb | 1 - core/exposed/publish.gradle | 66 ---------------------- core/exposed/publish_config.kpsb | 1 - core/ktor/client/publish.gradle | 69 ----------------------- core/ktor/client/publish_config.kpsb | 1 - core/ktor/common/publish.gradle | 69 ----------------------- core/ktor/common/publish_config.kpsb | 1 - gradle.properties | 4 +- publishing/api/publish.gradle | 69 ----------------------- publishing/api/publish_config.kpsb | 1 - publishing/exposed/publish.gradle | 69 ----------------------- publishing/exposed/publish_config.kpsb | 1 - 13 files changed, 2 insertions(+), 426 deletions(-) delete mode 100644 core/api/publish.gradle delete mode 100644 core/api/publish_config.kpsb delete mode 100644 core/exposed/publish.gradle delete mode 100644 core/exposed/publish_config.kpsb delete mode 100644 core/ktor/client/publish.gradle delete mode 100644 core/ktor/client/publish_config.kpsb delete mode 100644 core/ktor/common/publish.gradle delete mode 100644 core/ktor/common/publish_config.kpsb delete mode 100644 publishing/api/publish.gradle delete mode 100644 publishing/api/publish_config.kpsb delete mode 100644 publishing/exposed/publish.gradle delete mode 100644 publishing/exposed/publish_config.kpsb diff --git a/core/api/publish.gradle b/core/api/publish.gradle deleted file mode 100644 index 11b9082d..00000000 --- a/core/api/publish.gradle +++ /dev/null @@ -1,76 +0,0 @@ -apply plugin: 'maven-publish' - -task javadocsJar(type: Jar) { - classifier = 'javadoc' -} -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} - -publishing { - publications.all { - artifact javadocsJar - - pom { - description = "Core library for PostsSystem" - name = "PostsSystem Core" - url = "https://git.inmo.dev/PostsSystem/PostsSystemCore" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/PostsSystemCore.git[push=]https://git.inmo.dev/PostsSystem/PostsSystemCore.git" - url = "https://git.inmo.dev/PostsSystem/PostsSystemCore.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - - developer { - id = "mi-ast" - name = "Michail Astafiev" - email = "astaf65@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/PostsSystemCore/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } -} \ No newline at end of file diff --git a/core/api/publish_config.kpsb b/core/api/publish_config.kpsb deleted file mode 100644 index 10285f6c..00000000 --- a/core/api/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/PostsSystemCore/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core","description":"Core library for PostsSystem","url":"https://git.inmo.dev/PostsSystem/PostsSystemCore","vcsUrl":"https://git.inmo.dev/PostsSystem/PostsSystemCore.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"mi-ast","name":"Michail Astafiev","eMail":"astaf65@gmail.com"}]}} \ No newline at end of file diff --git a/core/exposed/publish.gradle b/core/exposed/publish.gradle deleted file mode 100644 index ac0a901a..00000000 --- a/core/exposed/publish.gradle +++ /dev/null @@ -1,66 +0,0 @@ -apply plugin: 'maven-publish' - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' -} - -publishing { - publications { - maven(MavenPublication) { - from components.java - - artifact sourcesJar - artifact javadocJar - - pom { - resolveStrategy = Closure.DELEGATE_FIRST - - description = "Exposed realisation for PostsSystem Core" - name = "PostsSystem Core Exposed realization" - url = "https://git.inmo.dev/PostsSystem/Core/" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" - url = "https://git.inmo.dev/PostsSystem/Core/.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } - } -} \ No newline at end of file diff --git a/core/exposed/publish_config.kpsb b/core/exposed/publish_config.kpsb deleted file mode 100644 index 0f19062d..00000000 --- a/core/exposed/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.inmo.dev/PostsSystem/Core/","vcsUrl":"https://git.inmo.dev/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"JVM"} \ No newline at end of file diff --git a/core/ktor/client/publish.gradle b/core/ktor/client/publish.gradle deleted file mode 100644 index c8fb12bc..00000000 --- a/core/ktor/client/publish.gradle +++ /dev/null @@ -1,69 +0,0 @@ -apply plugin: 'maven-publish' - -task javadocsJar(type: Jar) { - classifier = 'javadoc' -} -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} - -publishing { - publications.all { - artifact javadocsJar - - pom { - description = "Exposed realisation for PostsSystem Core" - name = "PostsSystem Core Exposed realization" - url = "https://git.inmo.dev/PostsSystem/Core/" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" - url = "https://git.inmo.dev/PostsSystem/Core/.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } -} \ No newline at end of file diff --git a/core/ktor/client/publish_config.kpsb b/core/ktor/client/publish_config.kpsb deleted file mode 100644 index f8300823..00000000 --- a/core/ktor/client/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.inmo.dev/PostsSystem/Core/","vcsUrl":"https://git.inmo.dev/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file diff --git a/core/ktor/common/publish.gradle b/core/ktor/common/publish.gradle deleted file mode 100644 index c8fb12bc..00000000 --- a/core/ktor/common/publish.gradle +++ /dev/null @@ -1,69 +0,0 @@ -apply plugin: 'maven-publish' - -task javadocsJar(type: Jar) { - classifier = 'javadoc' -} -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} - -publishing { - publications.all { - artifact javadocsJar - - pom { - description = "Exposed realisation for PostsSystem Core" - name = "PostsSystem Core Exposed realization" - url = "https://git.inmo.dev/PostsSystem/Core/" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" - url = "https://git.inmo.dev/PostsSystem/Core/.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } -} \ No newline at end of file diff --git a/core/ktor/common/publish_config.kpsb b/core/ktor/common/publish_config.kpsb deleted file mode 100644 index f8300823..00000000 --- a/core/ktor/common/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Exposed realization","description":"Exposed realisation for PostsSystem Core","url":"https://git.inmo.dev/PostsSystem/Core/","vcsUrl":"https://git.inmo.dev/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 48b6fc2f..b52ce219 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,6 +45,6 @@ dokka_version=1.4.0 # Project data -core_version=0.6.0 +version=0.6.0 android_code_version=1 -group_name=dev.inmo +group=dev.inmo diff --git a/publishing/api/publish.gradle b/publishing/api/publish.gradle deleted file mode 100644 index 02ea0500..00000000 --- a/publishing/api/publish.gradle +++ /dev/null @@ -1,69 +0,0 @@ -apply plugin: 'maven-publish' - -task javadocsJar(type: Jar) { - classifier = 'javadoc' -} -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} - -publishing { - publications.all { - artifact javadocsJar - - pom { - description = "Publishing subsystem with necessary functionality related to publish mechanism" - name = "PostsSystem Core Publishing subsystem" - url = "https://git.inmo.dev/PostsSystem/Core/" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" - url = "https://git.inmo.dev/PostsSystem/Core/.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } -} \ No newline at end of file diff --git a/publishing/api/publish_config.kpsb b/publishing/api/publish_config.kpsb deleted file mode 100644 index 92e5dfd8..00000000 --- a/publishing/api/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Publishing subsystem","description":"Publishing subsystem with necessary functionality related to publish mechanism","url":"https://git.inmo.dev/PostsSystem/Core/","vcsUrl":"https://git.inmo.dev/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]},"type":"Multiplatform"} \ No newline at end of file diff --git a/publishing/exposed/publish.gradle b/publishing/exposed/publish.gradle deleted file mode 100644 index 0e99383d..00000000 --- a/publishing/exposed/publish.gradle +++ /dev/null @@ -1,69 +0,0 @@ -apply plugin: 'maven-publish' - -task javadocsJar(type: Jar) { - classifier = 'javadoc' -} -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} - -publishing { - publications.all { - artifact javadocsJar - - pom { - description = "Exposed realisation for PostsSystem Core Publishing subsystem" - name = "PostsSystem Core Publishing Exposed realization" - url = "https://git.inmo.dev/PostsSystem/Core/" - - scm { - developerConnection = "scm:git:[fetch=]https://git.inmo.dev/PostsSystem/Core/.git[push=]https://git.inmo.dev/PostsSystem/Core/.git" - url = "https://git.inmo.dev/PostsSystem/Core/.git" - } - - developers { - - developer { - id = "InsanusMokrassar" - name = "Ovsiannikov Aleksei" - email = "ovsyannikov.alexey95@gmail.com" - } - - } - - licenses { - - license { - name = "Apache Software License 2.0" - url = "https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE" - } - - } - } - - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/InsanusMokrassar/${project.name}/;publish=0;override=0") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - } - } - } - - } -} \ No newline at end of file diff --git a/publishing/exposed/publish_config.kpsb b/publishing/exposed/publish_config.kpsb deleted file mode 100644 index f13b5709..00000000 --- a/publishing/exposed/publish_config.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://github.com/PostsSystem/PostsSystemCore"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.inmo.dev/PostsSystem/Core/src/master/LICENSE"}],"mavenConfig":{"name":"PostsSystem Core Publishing Exposed realization","description":"Exposed realisation for PostsSystem Core Publishing subsystem","url":"https://git.inmo.dev/PostsSystem/Core/","vcsUrl":"https://git.inmo.dev/PostsSystem/Core/.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file