From 4ad8da78b08e43bb6c5dc655c5f7babafa5519ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 22 Dec 2019 17:46:54 +0100 Subject: [PATCH] Update publish config --- .circleci/config.yml | 2 +- README.md | 7 ++++- build.gradle | 39 ++++++++++++++++++++--- mobile/build.gradle | 23 ++++++++++++++ scrapper/build.gradle | 72 +++++++++++++------------------------------ sdk/build.gradle | 23 ++++++++++++++ 6 files changed, 108 insertions(+), 58 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a39345c..9715d29a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: - store_artifacts: path: ./build/reports/tests/test - store_artifacts: - path: ./build/libs/sdk-0.12.0.jar + path: ./build/libs/sdk-0.14.0.jar deploy: <<: *container_config steps: diff --git a/README.md b/README.md index c6cca955..979e1e0f 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![Codecov branch](https://img.shields.io/codecov/c/github/wulkanowy/sdk/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/sdk) [![CircleCI branch](https://img.shields.io/circleci/project/github/wulkanowy/sdk/master.svg?style=flat-square)](https://circleci.com/gh/wulkanowy/sdk) +[![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/sdk.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/sdk) [![JitPack](https://img.shields.io/jitpack/v/wulkanowy/sdk.svg?style=flat-square)](https://jitpack.io/#wulkanowy/sdk) [![License](https://img.shields.io/github/license/wulkanowy/sdk.svg?style=flat-square)](https://github.com/wulkanowy/sdk) [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr) @@ -14,6 +15,10 @@ Check it out [full public api](https://github.com/wulkanowy/sdk/blob/master/sdk/ and [test examples](https://github.com/wulkanowy/sdk/blob/master/sdk/src/test/kotlin/io/github/wulkanowy/sdk/SdkRemoteTest.kt). +## Documentation + +Check [wiki page](https://github.com/wulkanowy/sdk/wiki). + ## Download ```gradle @@ -24,6 +29,6 @@ allprojects { } } dependencies { - implementation 'io.github.wulkanowy:sdk:master-SNAPSHOT' + implementation 'io.github.wulkanowy:sdk:0.13.0' } ``` diff --git a/build.gradle b/build.gradle index 347ff7c7..73bd8280 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,8 @@ plugins { id 'jacoco' id 'org.jetbrains.kotlin.jvm' version '1.3.61' apply false id "org.jlleitschuh.gradle.ktlint" version "9.1.1" -} - -subprojects { - version = "0.13.0-SNAPSHOT" - group = "io.github.wulkanowy" + id 'maven' + id 'com.jfrog.bintray' version '1.8.4' } ext { @@ -26,6 +23,38 @@ allprojects { apply plugin: 'kotlin' apply plugin: "org.jlleitschuh.gradle.ktlint" + version = PUBLISH_VERSION + group = "io.github.wulkanowy.sdk" + install { + repositories.mavenInstaller { + pom { + project { + packaging 'aar' + name 'SDK for VULCAN UONET+' + url SITE_URL + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + id 'mklkj' + name 'Mikołaj Pich' + email 'm.pich@outlook.com' + } + } + scm { + connection GIT_URL + developerConnection GIT_URL + url SITE_URL + } + } + } + } + } + ktlint { additionalEditorconfigFile = file(".editorconfig") disabledRules = [ diff --git a/mobile/build.gradle b/mobile/build.gradle index 6a5db240..71d424df 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.jetbrains.kotlin.jvm' id 'maven' + id 'com.jfrog.bintray' id 'jacoco' } @@ -17,3 +18,25 @@ dependencies { implementation "com.squareup.retrofit2:retrofit:$retrofit" implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit" } + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + configurations = ['archives'] + pkg { + repo = 'wulkanowy' + name = 'mobile' + userOrg = 'wulkanowy' + licenses = ['Apache-2.0'] + vcsUrl = GIT_URL + labels = ['wulkanowy', 'sdk'] + publicDownloadNumbers = true + publish = true + + version { + name = PUBLISH_VERSION + vcsTag = PUBLISH_VERSION + released = new Date() + } + } +} diff --git a/scrapper/build.gradle b/scrapper/build.gradle index 95ee8131..8b83ed8b 100644 --- a/scrapper/build.gradle +++ b/scrapper/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'org.jetbrains.kotlin.jvm' id 'maven' + id 'com.jfrog.bintray' id 'jacoco' -// id 'com.jfrog.bintray' version '1.8.4' } dependencies { @@ -23,54 +23,24 @@ dependencies { testImplementation "org.slf4j:slf4j-simple:$slf4j" } -//bintray { -// user = System.getenv('BINTRAY_USER') -// key = System.getenv('BINTRAY_KEY') -// configurations = ['archives'] -// pkg { -// repo = 'wulkanowy' -// name = 'api' -// userOrg = 'wulkanowy' -// licenses = ['Apache-2.0'] -// vcsUrl = GIT_URL -// labels = ['aar', 'wulkanowy', 'api'] -// publicDownloadNumbers = true -// publish = true -// -// version { -// name = PUBLISH_VERSION -// vcsTag = PUBLISH_VERSION -// released = new Date() -// } -// } -//} +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + configurations = ['archives'] + pkg { + repo = 'wulkanowy' + name = 'scrapper' + userOrg = 'wulkanowy' + licenses = ['Apache-2.0'] + vcsUrl = GIT_URL + labels = ['wulkanowy', 'sdk'] + publicDownloadNumbers = true + publish = true -//install { -// repositories.mavenInstaller { -// pom { -// project { -// packaging 'aar' -// name 'Scraping API for VULCAN UONET+' -// url SITE_URL -// licenses { -// license { -// name 'The Apache Software License, Version 2.0' -// url 'http://www.apache.org/licenses/LICENSE-2.0.txt' -// } -// } -// developers { -// developer { -// id 'mklkj' -// name 'Mikołaj Pich' -// email 'm.pich@outlook.com' -// } -// } -// scm { -// connection GIT_URL -// developerConnection GIT_URL -// url SITE_URL -// } -// } -// } -// } -//} + version { + name = PUBLISH_VERSION + vcsTag = PUBLISH_VERSION + released = new Date() + } + } +} diff --git a/sdk/build.gradle b/sdk/build.gradle index 9c42c16f..4a7d8324 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.jetbrains.kotlin.jvm' id 'maven' + id 'com.jfrog.bintray' id 'jacoco' } @@ -9,3 +10,25 @@ dependencies { implementation project(":mobile") implementation project(":scrapper") } + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + configurations = ['archives'] + pkg { + repo = 'wulkanowy' + name = 'sdk' + userOrg = 'wulkanowy' + licenses = ['Apache-2.0'] + vcsUrl = GIT_URL + labels = ['wulkanowy', 'sdk'] + publicDownloadNumbers = true + publish = true + + version { + name = PUBLISH_VERSION + vcsTag = PUBLISH_VERSION + released = new Date() + } + } +}