Skip to content

Commit

Permalink
Update kotlin and fix travis-ci build (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexxxdev authored Jun 25, 2019
1 parent c5c6674 commit 3264500
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: trusty
language: java
jdk:
- oraclejdk8
- openjdk8
before_install:
- sudo apt-get install jq
- wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r '.assets[0].browser_download_url')
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3522966b0364e579c71fbed7b04b36a)](https://www.codacy.com/app/alexxxdev/fuel-comfy?utm_source=github.com&utm_medium=referral&utm_content=alexxxdev/fuel-comfy&utm_campaign=Badge_Grade)
[![codebeat badge](https://codebeat.co/badges/f5c150b2-7fd5-4317-980a-d5369f8a39c7)](https://codebeat.co/projects/github-com-alexxxdev-fuel-comfy-master)
[![Hits-of-Code](https://hitsofcode.com/github/alexxxdev/fuel-comfy)](https://hitsofcode.com/view/github/alexxxdev/fuel-comfy)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.31-blue.svg)](https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.40-blue.svg)](https://kotlinlang.org)
[![Fuel](https://img.shields.io/badge/Fuel-2.1.0-blue.svg)](https://github.com/kittinunf/fuel)

More comfortable use of [Fuel](https://github.com/kittinunf/fuel) as in [Retrofit](https://square.github.io/retrofit/) or [Feign](https://github.com/OpenFeign/feign) for Kotlin/Android
Expand Down
5 changes: 5 additions & 0 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinxSerializationVersion"
}

group = 'com.github.alexxxdev.fuelcomfy'
archivesBaseName = 'api'
version = '1.0.10'
description ="More comfortable use of Fuel as in Retrofit or Feign for Kotlin/Android"

sourceCompatibility = "8"
targetCompatibility = "8"

Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlinVersion = '1.3.31'
ext.kotlinVersion = '1.3.40'
ext.kotlinxSerializationVersion = '0.11.0'
ext.detektGradlePluginVersion = '1.0.0-RC14'
ext.gradleVersionsPlugin = '0.20.0'
ext.kotlinpoetVersion = '1.2.0'
ext.kotlinpoetVersion = '1.3.0'
ext.fuelVersion = '2.1.0'
ext.spekVersion = '2.0.2'
ext.spekVersion = '2.0.5'
ext.okio = '2.2.2'
ext.mockwebserver = '3.14.1'
ext.mockwebserver = '3.14.2'

repositories {
maven { url "https://kotlin.bintray.com/kotlinx" }
Expand All @@ -19,7 +19,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektGradlePluginVersion"
Expand Down
5 changes: 5 additions & 0 deletions processor-coroutines/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,10 @@ test {
}
}

group = 'com.github.alexxxdev.fuelcomfy'
archivesBaseName = 'processor-coroutines'
version = '1.0.10'
description ="More comfortable use of Fuel as in Retrofit or Feign for Kotlin/Android"

sourceCompatibility = "8"
targetCompatibility = "8"
5 changes: 5 additions & 0 deletions processor-gson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,10 @@ test {
}
}

group = 'com.github.alexxxdev.fuelcomfy'
archivesBaseName = 'processor-gson'
version = '1.0.10'
description ="More comfortable use of Fuel as in Retrofit or Feign for Kotlin/Android"

sourceCompatibility = "8"
targetCompatibility = "8"
5 changes: 5 additions & 0 deletions processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ dependencies {
testImplementation "com.squareup.okio:okio:$okio"
}

group = 'com.github.alexxxdev.fuelcomfy'
archivesBaseName = 'processor'
version = '1.0.10'
description ="More comfortable use of Fuel as in Retrofit or Feign for Kotlin/Android"

sourceCompatibility = "8"
targetCompatibility = "8"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ internal object JvmCompile {
fun exe(input: File, output: File): Boolean = K2JVMCompiler().run {
val args = K2JVMCompilerArguments().apply {
freeArgs = listOf(input.absolutePath)
loadBuiltInsFromDependencies = true
destination = output.absolutePath
classpath = System.getProperty("java.class.path")
.split(System.getProperty("path.separator"))
Expand Down

0 comments on commit 3264500

Please sign in to comment.