Convert to kotlin-dsl, update some dependencies

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
       - checkout
 
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum "retrofit-converter-thrifty/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "retrofit-converter-thrifty/build.gradle.kts" }}
 
       - run:
           name: Download Dependencies
@@ -19,7 +19,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum "retrofit-converter-thrifty/build.gradle" }}
+          key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "retrofit-converter-thrifty/build.gradle.kts" }}
 
       - run:
           name: Run Tests
@@ -30,4 +30,4 @@ jobs:
           command: bash <(curl -s https://codecov.io/bash)
 
       - store_test_results:
-          path: retrofit-converter-thrifty/build/test-results
+          path: retrofit-converter-thrifty/build/test-results

build.gradle.kts

@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        jcenter()
+    }
+    dependencies {
+        classpath("com.novoda:bintray-release:0.9.1")
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

deploy.sh

@@ -15,7 +15,7 @@ if [ ! -z "$4" ]; then
     tag_message="$4"
 fi
 
-./gradlew clean build generatePomFileForMavenPublication bintrayUpload -PbintrayUser=${username} -PbintrayKey=${api_key} -PdryRun=false && \
+./gradlew clean build bintrayUpload -PbintrayUser=${username} -PbintrayKey=${api_key} -PdryRun=false && \
 git tag -a "${version}" -m "${tag_message}" && \
 git push --tags
 

retrofit-converter-thrifty/build.gradle.kts

@@ -0,0 +1,55 @@
+import com.novoda.gradle.release.PublishExtension
+
+plugins {
+    id("java")
+    id("jacoco")
+    id("com.novoda.bintray-release")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+group = "co.infinum"
+version = "0.9.2"
+
+object Versions {
+    const val thrifty_version = "0.4.3"
+    const val retrofit_version = "2.4.0"
+    const val okhttp_version = "3.14.2"
+    const val okio_version = "2.2.2"
+}
+
+dependencies {
+    compile("com.microsoft.thrifty:thrifty-runtime:${Versions.thrifty_version}")
+    compile("com.squareup.okio:okio:${Versions.okio_version}")
+    compile("com.squareup.retrofit2:retrofit:${Versions.retrofit_version}")
+    testCompile("com.squareup.okhttp3:mockwebserver:${Versions.okhttp_version}")
+    testCompile("org.assertj:assertj-core:3.9.0")
+    testCompile("junit:junit:4.12")
+    compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+}
+
+tasks.withType<JacocoReport> {
+    reports {
+        xml.isEnabled = true
+        html.isEnabled = false
+    }
+}
+
+tasks {
+    check {
+        dependsOn(jacocoTestReport)
+    }
+}
+
+configure<PublishExtension> {
+    userOrg = "infinum"
+    groupId = project.group.toString()
+    artifactId = "retrofit-converter-thrifty"
+    publishVersion = project.version.toString()
+    desc = "Retrofit converter for Thrifty implementation of Apache Thrift"
+    website = "https://github.com/infinum/thrifty-retrofit-converter"
+    repoName = "android"
+}

settings.gradle.kts

@@ -0,0 +1,2 @@
+rootProject.name = "thrifty-converter"
+include(":retrofit-converter-thrifty")