From ae8cd304e991f4c754ca41025b1643ceac7fd54c Mon Sep 17 00:00:00 2001 From: Yasuhiro SHIMIZU Date: Tue, 25 Aug 2020 19:29:50 +0900 Subject: [PATCH] prepare for release v0.5.3 --- CHANGELOG.md | 2 +- README.md | 18 +++++++++--------- gradle.properties | 2 +- gradle/gradle-mvn-push.gradle | 16 ++++++++-------- kgql-compiler/build.gradle | 1 - kgql-core/build.gradle | 1 - kgql-gradle-plugin/build.gradle | 1 - release.sh | 6 +----- 8 files changed, 20 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cad0c6a..87774c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Change Log Badges: `[UPDATED]`, `[FIXED]`, `[ADDED]`, `[DEPRECATED]`, `[REMOVED]`, `[BREAKING]` -Version 0.5.3 *(IN DEVELOPMENT)* +Version 0.5.3 *(2020-08-25)* --- * `[UPDATED]`: Kotlin 1.4.0 * `[UPDATED]`: Android Gradle Plugin 4.0.1 diff --git a/README.md b/README.md index 9fc1e66..a84a8b6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ kgql === -[ ![Download](https://api.bintray.com/packages/yshrsmz/kgql/gradle-plugin/images/download.svg) ](https://bintray.com/yshrsmz/kgql/gradle-plugin/_latestVersion) +[![Download](https://api.bintray.com/packages/yshrsmz/kgql/gradle-plugin/images/download.svg)](https://bintray.com/yshrsmz/kgql/gradle-plugin/_latestVersion) GraphQL Document wrapper generator for Kotlin Multiplatform Project. Currently available for JVM/Android/iOS @@ -18,7 +18,7 @@ kgql Gradle Plugin generates wrapper classes for provided GraphQL document files ### Setup -kgql requires Gradle __5.4.1 or later__ +kgql requires Gradle __6.5 or later__ Supported GraphQL file extension: `.gql` or `.graphql` @@ -32,9 +32,9 @@ buildscript { maven { url "https://dl.bintray.com/yshrsmz/kgql" } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71' - classpath 'org.jetbrains.kotlin:kotlin-serialization:0.22.0' - classpath 'com.codingfeline.kgql:gradle-plugin:0.5.2' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0' + classpath 'org.jetbrains.kotlin:kotlin-serialization:1.0.0-RC' + classpath 'com.codingfeline.kgql:gradle-plugin:0.5.3' } } @@ -67,9 +67,9 @@ buildscript { maven { url "https://dl.bintray.com/yshrsmz/kgql" } } dependencies { - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71' - classpath 'org.jetbrains.kotlin:kotlin-serialization:0.22.0' - classpath 'com.codingfeline.kgql:gradle-plugin:0.5.2' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0' + classpath 'org.jetbrains.kotlin:kotlin-serialization:1.0.0-RC' + classpath 'com.codingfeline.kgql:gradle-plugin:0.5.3' } } @@ -237,7 +237,7 @@ $ ./gradlew -p sample generateKgqlInterface ``` # Try out the samples. # BuildKonfig will be generated in ./sample/build/kgql -$ ./gradlew clean publishAllPublicationsToTestRepository +$ ./gradlew clean build installArchives $ ./gradlew -p sample generateKgqlInterface ``` diff --git a/gradle.properties b/gradle.properties index 82bdcc7..96757fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official kotlin.js.compiler=both # GROUP=com.codingfeline.kgql -VERSION_NAME=0.5.3-SNAPSHOT +VERSION_NAME=0.5.3 # POM_URL=https://github.com/yshrsmz/kgql/ POM_SCM_URL=https://github.com/yshrsmz/kgql/ diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle index d988285..9d819e2 100644 --- a/gradle/gradle-mvn-push.gradle +++ b/gradle/gradle-mvn-push.gradle @@ -20,19 +20,19 @@ def findProperty(String key) { [project.properties[key], System.getenv(key)].find { it != null } } -def getReleaseRepositoryUrl() { +def getReleaseRepositoryUrlFromProperty() { return findProperty("RELEASE_REPOSITORY_URL") ?: "https://api.bintray.com/maven/$BINTRAY_ORG/$BINTRAY_REPOSITORY/$POM_ARTIFACT_ID" } -def getSnapshotRepositoryUrl() { +def getSnapshotRepositoryUrlFromProperty() { return findProperty("SNAPSHOT_REPOSITORY_URL") ?: "https://oss.jfrog.org/artifactory/oss-snapshot-local" } -def getRepositoryUsername() { +def getRepositoryUsernameFromProperty() { return findProperty("BINTRAY_USER") ?: "no.bintray.user" } -def getRepositoryPassword() { +def getRepositoryPasswordFromProperty() { return findProperty("BINTRAY_API_KEY") ?: "no.bintray.api.key" } @@ -40,10 +40,10 @@ mavenPublish { releaseSigningEnabled = false targets { uploadArchives { - releaseRepositoryUrl = getReleaseRepositoryUrl() - snapshotRepositoryUrl = getSnapshotRepositoryUrl() - repositoryUsername = getRepositoryUsername() - repositoryPassword = getRepositoryPassword() + releaseRepositoryUrl = getReleaseRepositoryUrlFromProperty() + snapshotRepositoryUrl = null + repositoryUsername = getRepositoryUsernameFromProperty() + repositoryPassword = getRepositoryPasswordFromProperty() } installArchives { releaseRepositoryUrl = file("${rootProject.buildDir}/localMaven").toURI().toString() diff --git a/kgql-compiler/build.gradle b/kgql-compiler/build.gradle index 0c44c16..07152e3 100644 --- a/kgql-compiler/build.gradle +++ b/kgql-compiler/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'org.jetbrains.kotlin.jvm' -apply plugin: 'maven-publish' sourceSets { main.java.srcDir "gen" diff --git a/kgql-core/build.gradle b/kgql-core/build.gradle index 9982914..2e1eb48 100644 --- a/kgql-core/build.gradle +++ b/kgql-core/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'kotlin-multiplatform' apply plugin: 'kotlinx-serialization' -apply plugin: 'maven-publish' archivesBaseName = 'kgql-core' diff --git a/kgql-gradle-plugin/build.gradle b/kgql-gradle-plugin/build.gradle index 8eff446..9587b8a 100644 --- a/kgql-gradle-plugin/build.gradle +++ b/kgql-gradle-plugin/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'java-gradle-plugin' apply plugin: "com.gradle.plugin-publish" -apply plugin: "maven-publish" sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/release.sh b/release.sh index 9d66c04..f3dffec 100644 --- a/release.sh +++ b/release.sh @@ -1,7 +1,3 @@ #!/usr/bin/env sh -./gradlew clean -./gradlew build -./gradlew :kgql-core:publishAllPublicationsToMavenRepository -./gradlew :kgql-compiler:publishAllPublicationsToMavenRepository -./gradlew :kgql-gradle-plugin:publishAllPublicationsToMavenRepository :kgql-gradle-plugin:publishPlugins +./gradlew clean build uploadArchives :kgql-gradle-plugin:publishPlugins --no-daemon --no-parallel