Skip to content
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit 578047c

Browse files
author
Axier Fernandez
committed
Kotlin, anko, OkHttp and Gson libraries updated
1 parent 653eb6e commit 578047c

File tree

17 files changed

+33
-32
lines changed

17 files changed

+33
-32
lines changed

gradle/anko-asynchronous-tasks/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ android {
2626
dependencies {
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
2828
compile 'com.android.support:appcompat-v7:25.3.1'
29-
compile 'com.google.code.gson:gson:2.7'
30-
compile 'com.squareup.okhttp:okhttp:2.3.0'
29+
compile 'com.google.code.gson:gson:2.8.1'
30+
compile 'com.squareup.okhttp3:okhttp:3.8.1'
3131
// Kotlin
3232
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3333
// Anko
34-
compile "org.jetbrains.anko:anko-sdk15:$anko_version"
34+
compile "org.jetbrains.anko:anko:$anko_version"
3535
compile "org.jetbrains.anko:anko-support-v4:$anko_version"
3636
compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
3737
}

gradle/anko-asynchronous-tasks/app/src/main/java/org/example/kotlin/MainActivity.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import com.google.gson.GsonBuilder
88
import org.example.kotlin.deserializers.WeatherDeserializer
99
import org.example.kotlin.models.WeatherObject
1010
import org.example.kotlin.networking.NetworkClient
11-
12-
1311
import org.jetbrains.anko.*
12+
import org.jetbrains.anko.sdk25.coroutines.onClick
1413
import java.io.BufferedInputStream
1514
import java.io.BufferedReader
1615
import java.io.InputStreamReader

gradle/anko-asynchronous-tasks/app/src/main/java/org/example/kotlin/networking/NetworkClient.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.kotlin.networking
22

3-
import com.squareup.okhttp.OkHttpClient
4-
import com.squareup.okhttp.Request
3+
import okhttp3.OkHttpClient
4+
import okhttp3.Request
55
import java.io.InputStream
66

77
/**
@@ -15,7 +15,7 @@ open class NetworkClient {
1515
val body = response.body()
1616
// body.toString() returns a string representing the object and not the body itself, probably
1717
// kotlins fault when using third party libraries. Use byteStream() and convert it to a String
18-
return body.byteStream()
18+
return body!!.byteStream()
1919
}
2020

2121
}

gradle/anko-asynchronous-tasks/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
6-
ext.anko_version = '0.9.1'
5+
ext.kotlin_version = '1.1.4-2'
6+
ext.anko_version = '0.10.1'
77

88
repositories {
99
jcenter()

gradle/anko-simple-ui/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ android {
2626
dependencies {
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
2828
compile 'com.android.support:appcompat-v7:25.3.1'
29-
compile 'com.google.code.gson:gson:2.7'
30-
compile 'com.squareup.okhttp:okhttp:2.3.0'
29+
compile 'com.google.code.gson:gson:2.8.1'
30+
compile 'com.squareup.okhttp3:okhttp:3.8.1'
3131
// Kotlin
3232
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3333
// Anko
34-
compile "org.jetbrains.anko:anko-sdk15:$anko_version"
34+
compile "org.jetbrains.anko:anko:$anko_version"
3535
compile "org.jetbrains.anko:anko-support-v4:$anko_version"
3636
compile "org.jetbrains.anko:anko-appcompat-v7:$anko_version"
3737
}

gradle/anko-simple-ui/app/src/main/java/org/example/kotlin/MainActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.example.kotlin.deserializers.WeatherDeserializer
1111
import org.example.kotlin.models.WeatherObject
1212
import org.example.kotlin.networking.NetworkClient
1313
import org.jetbrains.anko.*
14+
import org.jetbrains.anko.sdk25.coroutines.onClick
1415
import java.io.BufferedInputStream
1516
import java.io.BufferedReader
1617
import java.io.InputStreamReader

gradle/anko-simple-ui/app/src/main/java/org/example/kotlin/networking/NetworkClient.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.kotlin.networking
22

3-
import com.squareup.okhttp.OkHttpClient
4-
import com.squareup.okhttp.Request
3+
import okhttp3.OkHttpClient
4+
import okhttp3.Request
55
import java.io.InputStream
66

77
/**
@@ -15,7 +15,7 @@ open class NetworkClient {
1515
val body = response.body()
1616
// body.toString() returns a string representing the object and not the body itself, probably
1717
// kotlins fault when using third party libraries. Use byteStream() and convert it to a String
18-
return body.byteStream()
18+
return body!!.byteStream()
1919
}
2020

2121
}

gradle/anko-simple-ui/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
6-
ext.anko_version = '0.9.1'
5+
ext.kotlin_version = '1.1.4-2'
6+
ext.anko_version = '0.10.1'
77

88
repositories {
99
jcenter()

gradle/gson-deserializers-okhttp-asynctask/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
dependencies {
2828
compile fileTree(dir: 'libs', include: ['*.jar'])
2929
compile 'com.android.support:appcompat-v7:25.3.1'
30-
compile 'com.google.code.gson:gson:2.7'
31-
compile 'com.squareup.okhttp:okhttp:2.3.0'
30+
compile 'com.google.code.gson:gson:2.8.1'
31+
compile 'com.squareup.okhttp3:okhttp:3.8.1'
3232
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3333
}
3434

gradle/gson-deserializers-okhttp-asynctask/app/src/main/java/org/example/kotlin/networking/NetworkClient.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.example.kotlin.networking
22

3-
import com.squareup.okhttp.OkHttpClient
4-
import com.squareup.okhttp.Request
3+
4+
import okhttp3.OkHttpClient
5+
import okhttp3.Request
56
import java.io.InputStream
67

78
/**
@@ -15,7 +16,7 @@ open class NetworkClient {
1516
val body = response.body()
1617
// body.toString() returns a string representing the object and not the body itself, probably
1718
// kotlins fault when using third party libraries. Use byteStream() and convert it to a String
18-
return body.byteStream()
19+
return body!!.byteStream()
1920
}
2021

2122
}

gradle/gson-deserializers-okhttp-asynctask/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
5+
ext.kotlin_version = '1.1.4-2'
66

77
repositories {
88
jcenter()

gradle/httpurlconnection-asynctask/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
5+
ext.kotlin_version = '1.1.4-2'
66

77
repositories {
88
jcenter()

gradle/listview-baseadapter-data-object/app/src/main/java/org/example/kotlin/models/CustomPojo.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ open class CustomPojo (var name: String) {
1010
println("Customer initialized with value ${name}")
1111
}
1212

13-
override fun toString() = "$name"
1413
}

gradle/listview-baseadapter-data-object/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
5+
ext.kotlin_version = '1.1.4-2'
66

77
repositories {
88
jcenter()

gradle/okhttp-asynctask/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
dependencies {
2828
compile fileTree(dir: 'libs', include: ['*.jar'])
2929
compile 'com.android.support:appcompat-v7:25.3.1'
30-
compile 'com.squareup.okhttp:okhttp:2.3.0'
30+
compile 'com.squareup.okhttp3:okhttp:3.8.1'
3131
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3232
}
3333

gradle/okhttp-asynctask/app/src/main/java/org/example/kotlin/networking/NetworkClient.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.example.kotlin.networking
22

3-
import com.squareup.okhttp.OkHttpClient
4-
import com.squareup.okhttp.Request
3+
4+
import okhttp3.OkHttpClient
5+
import okhttp3.Request
56
import java.io.InputStream
67

78
/**
@@ -15,7 +16,7 @@ open class NetworkClient {
1516
val body = response.body()
1617
// body.toString() returns a string representing the object and not the body itself, probably
1718
// kotlins fault when using third party libraries. Use byteStream() and convert it to a String
18-
return body.byteStream()
19+
return body!!.byteStream()
1920
}
2021

2122
}

gradle/okhttp-asynctask/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
buildscript {
44

5-
ext.kotlin_version = '1.1.2'
5+
ext.kotlin_version = '1.1.4-2'
66

77
repositories {
88
jcenter()

0 commit comments

Comments
 (0)