From 6a119dfe496ae4ac62b19d8e1ff40ff00667c606 Mon Sep 17 00:00:00 2001 From: Jaewe Heo Date: Tue, 16 Feb 2016 21:58:17 +0900 Subject: [PATCH 1/3] add more options (base url, accept header) for enterprise #3 --- .../co/riiid/gradle/GithubExtension.groovy | 19 +++++++++++++++++++ .../groovy/co/riiid/gradle/ReleaseTask.groovy | 16 ++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/co/riiid/gradle/GithubExtension.groovy b/src/main/groovy/co/riiid/gradle/GithubExtension.groovy index 24748ef..21005aa 100644 --- a/src/main/groovy/co/riiid/gradle/GithubExtension.groovy +++ b/src/main/groovy/co/riiid/gradle/GithubExtension.groovy @@ -2,6 +2,9 @@ package co.riiid.gradle class GithubExtension { + String baseUrl = "https://api.github.com" + String acceptHeader = 'application/vnd.github.v3+json' + String owner String repo String token @@ -16,6 +19,14 @@ class GithubExtension { String[] assets + String getBaseUrl() { + return baseUrl + } + + String getAcceptHeader() { + return acceptHeader + } + String getOwner() { return owner } @@ -56,6 +67,14 @@ class GithubExtension { return assets } + void setBaseUrl(String baseUrl) { + this.baseUrl = baseUrl + } + + void setAcceptHeader(String acceptHeader) { + this.acceptHeader = acceptHeader + } + void setOwner(String owner) { if (owner == null || owner.isEmpty()) { throw new IllegalArgumentException("owner") diff --git a/src/main/groovy/co/riiid/gradle/ReleaseTask.groovy b/src/main/groovy/co/riiid/gradle/ReleaseTask.groovy index c5403b2..828e535 100644 --- a/src/main/groovy/co/riiid/gradle/ReleaseTask.groovy +++ b/src/main/groovy/co/riiid/gradle/ReleaseTask.groovy @@ -8,15 +8,15 @@ import org.zeroturnaround.zip.ZipUtil class ReleaseTask extends DefaultTask { - final String BASE_URL = 'https://api.github.com' - // header - final String HEADER_ACCEPT = 'application/vnd.github.v3+json' final String HEADER_USER_AGENT = 'gradle-github-plugin' @TaskAction public release() { - def http = new HttpBuilder(BASE_URL) + def baseUrl = project.github.getBaseUrl() + def accept = project.github.getAcceptHeader() + + def http = new HttpBuilder(baseUrl) def path = "/repos/" + "${project.github.owner}/" + @@ -38,12 +38,12 @@ class ReleaseTask extends DefaultTask { headers.'User-Agent' = HEADER_USER_AGENT headers.'Authorization' = "token ${project.github.token}" - headers.'Accept' = HEADER_ACCEPT + headers.'Accept' = accept response.success = { resp, json -> println json if (project.github.assets != null) { - postAssets(json.upload_url, project.github.assets) + postAssets(json.upload_url, project.github.assets, accept) } } @@ -53,7 +53,7 @@ class ReleaseTask extends DefaultTask { } } - public postAssets(uploadUrl, assets) { + public postAssets(uploadUrl, assets, accept) { assets.each { asset -> def file = new File(asset as String) def name = asset.split('/')[-1] @@ -91,7 +91,7 @@ class ReleaseTask extends DefaultTask { headers.'User-Agent' = HEADER_USER_AGENT headers.'Authorization' = "token ${project.github.token}" - headers.'Accept' = HEADER_ACCEPT + headers.'Accept' = accept headers.'Content-Type' = contentType From da4bdf2fc1e453baf595654d9d25961e8036fd5c Mon Sep 17 00:00:00 2001 From: Jaewe Heo Date: Tue, 16 Feb 2016 22:07:25 +0900 Subject: [PATCH 2/3] restore gradle plugin --- build.gradle | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9f460ef..8e1a513 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,14 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.gradle.publish:plugin-publish-plugin:0.9.3" + } +} + plugins { id "com.jfrog.bintray" version "1.6" } @@ -6,12 +17,27 @@ apply plugin: 'groovy' apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'signing' +apply plugin: "com.gradle.plugin-publish" def GradleGithubPluginGroupId = 'co.riiid' -def GradleGithubPluginVersion = '0.3.2' +def GradleGithubPluginVersion = '0.4.0' def GradleGithubPluginArtifact = 'gradle-github-plugin' def GradleGithubPluginUrl = 'https://github.com/riiid/gradle-github-plugin' +pluginBundle { + website = GradleGithubPluginUrl + vcsUrl = GradleGithubPluginUrl + description = 'Gradle plugin for Github releases' + tags = ['github', 'gradle', 'release', 'releases'] + + plugins { + greetingsPlugin { + id = 'co.riiid.gradle' + displayName = 'Gradle plugin for Github releases' + } + } +} + task javadocJar(type: Jar) { classifier = 'javadoc' from 'build/docs/groovydoc' From 298e4a40926fade43fa2a469fa63bca325263160 Mon Sep 17 00:00:00 2001 From: Jaewe Heo Date: Tue, 16 Feb 2016 22:12:16 +0900 Subject: [PATCH 3/3] update readme.md added base url --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 45e7ef1..7e3fa1d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ buildscript { dependencies { ... - classpath 'co.riiid:gradle-github-plugin:0.3.1' + classpath 'co.riiid:gradle-github-plugin:0.4.0' ... } } @@ -43,7 +43,7 @@ apply plugin: 'co.riiid.gradle' ```groovy plugins { - id "co.riiid.gradle" version "0.3.1" + id "co.riiid.gradle" version "0.4.0" } ``` @@ -53,6 +53,7 @@ Add `github` configuration and set properties if you've done with 1 or 2. ### Supported Properties Name | Type | Description --- | --- | --- +baseUrl | String | *Optional.* The URL of Github. You can change this url as yours if you use Github Enterprise. (Default: https://api.github.com) owner | String | *Required.* The id of your Github. repo | String | *Required.* The name of your Github's repository. token | String | *Required.* Github access token. Generate yours in [Settings/Tokens][settings_tokens]