Maven central migration

CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+## Version 3.0.0
+
+_2021-03-11_
+
+- use [Thrifty 2.1.2](https://github.com/microsoft/thrifty/blob/master/CHANGELOG.md)
+- use Okio 2.10.0, OkHttp 4.9.1, Kotlin 1.4.30
+- migrate deployment to Maven Central
+- change group id `co.infinum` -> `com.infinum`
+- change package name `co.infinum` -> `com.infinum`
+
 ## Version 2.0.0
 
 _2020-06-01_

README.md

@@ -1,7 +1,6 @@
 # Thrifty Retrofit converter
 
 [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
-[![Download](https://api.bintray.com/packages/infinum/android/retrofit-converter-thrifty/images/download.svg) ](https://bintray.com/infinum/android/retrofit-converter-thrifty/_latestVersion)
 
 A `Retrofit converter` implementation using [Thrifty](https://github.com/Microsoft/thrifty) for
 (de)serialization of Apache Thrift requests and responses.
@@ -11,10 +10,10 @@ It supports Thrifty models generated in both `Java` and `Kotlin`.
 
 ## Usage
 
-Add the library as a dependency to your `build.gradle` to automatically download it from jcenter.
+Add the library as a dependency to your `build.gradle` to automatically download it from Maven Central.
 
 ```groovy
-compile 'co.infinum:retrofit-converter-thrifty:2.0.0'
+implementation "com.infinum:retrofit-converter-thrifty:3.0.0"
 ```
 
 ... and add the converter factory when you create the `Retrofit` object.
@@ -28,25 +27,40 @@ Retrofit retrofit = new Retrofit.Builder()
 
 We also maintain a [changelog](CHANGELOG.md).
 
-## Generating new files with thrifty compiler
+## Contributing
+
+Feedback and code contributions are very much welcome. Just make a pull request with a short description of your changes. By making contributions to this project you give permission for your code to be used under the same [license](LICENSE).
+
+### Generating new files with the thrifty compiler
 
 In case source files need to be generated from .thrift files using a different version of the thrifty compiler, use these commands:
 
 ```shell
-java -jar thrifty-compiler-2.0.1-all.jar --out=retrofit-converter-thrifty/src/test/java/ --lang=java retrofit-converter-thrifty/src/test/resources/phone.thrift
-java -jar thrifty-compiler-2.0.1-all.jar --out=retrofit-converter-thrifty/src/test/java/ --lang=kotlin --kt-file-per-type retrofit-converter-thrifty/src/test/resources/phone.thrift
-
+wget https://repo1.maven.org/maven2/com/microsoft/thrifty/thrifty-compiler/2.1.2/thrifty-compiler-2.1.2-all.jar
+java -jar thrifty-compiler-2.1.2-all.jar --out=retrofit-converter-thrifty/src/test/java/ --lang=java retrofit-converter-thrifty/src/test/resources/phone.thrift
+java -jar thrifty-compiler-2.1.2-all.jar --out=retrofit-converter-thrifty/src/test/kotlin/ --lang=kotlin --kt-file-per-type retrofit-converter-thrifty/src/test/resources/phone.thrift
 ```
 
-## Deploying a new version
+### Deploying a new version
 
-To deploy a new version to bintray, use `deploy.sh`:
+To publish  to Maven Central you first need to set the following [Gradle properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties):
 
+```
+signing.keyId=<GPG_KEY_ID>
+signing.password=<GPG_KEY_PASSWORD>
+signing.secretKeyRingFile=<GPG_SECRING_LOCATION>
+
+sonatypeUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+sonatypeUsername=<SONATYPE_USERNAME>
+sonatypePassword=<SONATYPE_PASSWORD>
+```
+
+To deploy a new version to Maven Central, use `deploy.sh`:
 
 ```shell
-./deploy.sh <bintray username> <bintray api key> <artifact version> [optional tag message]
+./publish.sh <artifact version> [optional tag message]
 ```
 
-## Contributing
+The `publish.sh` script will automatically push a tag with the version name and change the version in the README.
 
-Feedback and code contributions are very much welcome. Just make a pull request with a short description of your changes. By making contributions to this project you give permission for your code to be used under the same [license](LICENSE).
+All you need to do after the script runs is to press release in [Sonatype OSS](https://oss.sonatype.org/#stagingRepositories).

build.gradle.kts

@@ -1,15 +1,35 @@
+plugins {
+    id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
+}
+
 buildscript {
     repositories {
         maven { url = uri("https://plugins.gradle.org/m2/") }
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.novoda:bintray-release:0.9.1")
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
+
+group = "com.infinum"
+version = "3.0.0"
+
+nexusPublishing {
+    repositories {
+        sonatype()
+    }
+}
+
+//do not generate extra load on Nexus with new staging repository if signing fails
+val initializeSonatypeStagingRepository by tasks.existing
+subprojects {
+    initializeSonatypeStagingRepository {
+        shouldRunAfter(tasks.withType<Sign>())
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

publish.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+######################################################################################################
+#
+# This deploy script requires have all the necessary gradle properties already set up:
+# - signing.keyId
+# - signing.password
+# - signing.secretKeyRingFile
+# - sonatype.url
+# - sonatype.username
+# - sonatype.password
+#
+######################################################################################################
+
+# Stop script on errors or undefined vars
+set -euo pipefail;
+
+readonly SCRIPT_NAME="$(basename "$0")"
+readonly green="\e[0;32m"
+readonly red="\e[0;31m"
+readonly reset="\e[0m"
+
+if [ $# -lt 1 ]; then
+    echo
+    echo "Usage:"
+    echo -e "${green}$SCRIPT_NAME <version> [optional tag message]${reset}"
+    exit 1
+fi
+
+readonly version="$1"
+
+# default tag message
+tag_message="$version release"
+
+if [ -n "${2-}" ]; then
+    tag_message="$2"
+fi
+
+echo -e "${green}Building and uploading release ...${reset}"
+./gradlew clean build publishToSonatype
+
+echo -e "${green}Closing sonatype staging repository ...${reset}"
+./gradlew closeSonatypeStagingRepository
+
+echo -e "${green}Pushing version tag ...${reset}"
+git tag -a "${version}" -m "${tag_message}" && \
+git push --tags
+
+# fix version in README.md if needed
+echo -e "${green}Setting version in README.md to $version ...${reset}"
+sed -E "s/\"com.infinum:retrofit-converter-thrifty:[\.0-9]+\"/\"com.infinum:retrofit-converter-thrifty:$version\"/g" README.md > tmp_readme && mv tmp_readme README.md
+
+# show changes so we know to commit if needed
+echo -e "${green}\nHere's the output of git status:\n${reset}"
+git status
+
+echo -e "${red}\n\nDON'T FORGET to release the artifact on https://oss.sonatype.org/#stagingRepositories !\n${reset}"