Skip to content

Commit 1df7341

Browse files
committed
Support latest Kotlin version 1.0.0-rc-1036
1 parent 5a0d88b commit 1df7341

File tree

5 files changed

+22
-32
lines changed

5 files changed

+22
-32
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fuel
22

3-
[ ![Kotlin](https://img.shields.io/badge/Kotlin-1.0.0--beta--4589-blue.svg)](http://kotlinlang.org) [ ![jcenter](https://api.bintray.com/packages/kittinunf/maven/Fuel-Android/images/download.svg) ](https://bintray.com/kittinunf/maven/Fuel-Android/_latestVersion) [![Build Status](https://travis-ci.org/kittinunf/Fuel.svg?branch=master)](https://travis-ci.org/kittinunf/Fuel)
3+
[ ![Kotlin](https://img.shields.io/badge/Kotlin-1.0.0--rc--1036-blue.svg)](http://kotlinlang.org) [ ![jcenter](https://api.bintray.com/packages/kittinunf/maven/Fuel-Android/images/download.svg) ](https://bintray.com/kittinunf/maven/Fuel-Android/_latestVersion) [![Build Status](https://travis-ci.org/kittinunf/Fuel.svg?branch=master)](https://travis-ci.org/kittinunf/Fuel)
44

55
The easiest HTTP networking library for Kotlin/Android.
66

build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,15 @@ buildscript {
1717

1818
allprojects {
1919
ext {
20-
publishVersion = '0.71'
20+
publish_version = '1.0.0-rc-1036'
21+
22+
//dependencies version
23+
kotlin_version = '1.0.0-rc-1036'
24+
result_version = '1.0.0-rc-1036'
25+
26+
//test dependencies version
27+
junit_version = '4.12'
28+
robolectric_version = '3.0'
2129
}
2230

2331
repositories {

fuel-android/build.gradle

+6-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
minSdkVersion 9
1616
targetSdkVersion 23
1717
versionCode 1
18-
versionName parent.ext.publishVersion
18+
versionName parent.ext.publish_version
1919
}
2020

2121
sourceSets {
@@ -46,30 +46,21 @@ android {
4646
}
4747

4848
dependencies {
49-
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
49+
compile "org.jetbrains.kotlin:kotlin-stdlib:$parent.ext.kotlin_version"
5050

5151
compile project(':fuel')
5252

53-
testCompile "junit:junit:$junit_version"
54-
testCompile "org.robolectric:robolectric:$robolectric_version"
53+
testCompile "junit:junit:$parent.ext.junit_version"
54+
testCompile "org.robolectric:robolectric:$parent.ext.robolectric_version"
5555
}
5656

5757
buildscript {
58-
ext {
59-
//dependencies version
60-
kotlin_version = '1.0.0-beta-4589'
61-
62-
//test dependencies version
63-
junit_version = '4.12'
64-
robolectric_version = '3.0'
65-
}
66-
6758
repositories {
6859
mavenCentral()
6960
}
7061

7162
dependencies {
72-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
63+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$parent.ext.kotlin_version"
7364
}
7465
}
7566

@@ -79,7 +70,7 @@ publish {
7970
desc = 'The easiest HTTP networking library in Kotlin/Android'
8071
groupId = 'com.github.kittinunf.fuel'
8172
licences = ['MIT']
82-
publishVersion = parent.ext.publishVersion
73+
publishVersion = parent.ext.publish_version
8374
uploadName = 'Fuel-Android'
8475
website = 'https://github.com/kittinunf/Fuel'
8576
}

fuel/build.gradle

+5-14
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,19 @@ repositories {
1212
}
1313

1414
dependencies {
15-
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
16-
compile "com.github.kittinunf.result:result:$result_version"
15+
compile "org.jetbrains.kotlin:kotlin-stdlib:$parent.ext.kotlin_version"
16+
compile "com.github.kittinunf.result:result:$parent.ext.result_version"
1717

18-
testCompile "junit:junit:$junit_version"
18+
testCompile "junit:junit:$parent.ext.junit_version"
1919
}
2020

2121
buildscript {
22-
ext {
23-
//dependencies version
24-
kotlin_version = '1.0.0-beta-4589'
25-
result_version = '0.31'
26-
27-
//test dependencies version
28-
junit_version = '4.12'
29-
}
30-
3122
repositories {
3223
mavenCentral()
3324
}
3425

3526
dependencies {
36-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
27+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$parent.ext.kotlin_version"
3728
}
3829
}
3930

@@ -43,7 +34,7 @@ publish {
4334
desc = 'The easiest HTTP networking library in Kotlin/Android'
4435
groupId = 'com.github.kittinunf.fuel'
4536
licences = ['MIT']
46-
publishVersion = parent.ext.publishVersion
37+
publishVersion = parent.ext.publish_version
4738
uploadName = 'Fuel-Android'
4839
website = 'https://github.com/kittinunf/Fuel'
4940
}

fuel/src/main/kotlin/com/github/kittinunf/fuel/util/InputStreams.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.github.kittinunf.fuel.util
33
import java.io.InputStream
44
import java.io.OutputStream
55

6-
fun InputStream.copyTo(out: OutputStream, bufferSize: Int = defaultBufferSize, progress: ((Long) -> Unit)?): Long {
6+
fun InputStream.copyTo(out: OutputStream, bufferSize: Int = DEFAULT_BUFFER_SIZE, progress: ((Long) -> Unit)?): Long {
77
var bytesCopied = 0L
88
val buffer = ByteArray(bufferSize)
99
var bytes = read(buffer)

0 commit comments

Comments
 (0)