Skip to content

Commit c9ae19c

Browse files
author
Axier Fernandez
committed
Updated OkHttp_AsyncTask to the latest Kotlin version. Added synthetic properties and fixed minor bugs
1 parent 4182cef commit c9ae19c

File tree

5 files changed

+86
-75
lines changed

5 files changed

+86
-75
lines changed

‎OkHttp_AsyncTask/app/app.iml‎

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MyApplication" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MyApplication" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,90 +9,114 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
14+
<afterSyncTasks>
15+
<task>generateDebugSources</task>
16+
</afterSyncTasks>
1817
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1918
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2322
</configuration>
2423
</facet>
24+
<facet type="kotlin-language" name="Kotlin">
25+
<configuration version="2" platform="JVM 1.6" useProjectSettings="false">
26+
<compilerSettings />
27+
<compilerArguments>
28+
<option name="jvmTarget" value="1.6" />
29+
<option name="languageVersion" value="1.1" />
30+
<option name="apiVersion" value="1.1" />
31+
<option name="pluginClasspaths">
32+
<array />
33+
</option>
34+
<option name="coroutinesWarn" value="true" />
35+
<option name="pluginOptions">
36+
<array />
37+
</option>
38+
</compilerArguments>
39+
</configuration>
40+
</facet>
2541
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
42+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2743
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
44+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2945
<exclude-output />
3046
<content url="file://$MODULE_DIR$">
3147
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3248
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3349
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3450
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3552
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3754
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3855
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3956
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4057
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4159
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4361
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4462
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4563
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4664
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4765
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4966
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5075
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5176
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5277
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5378
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5479
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5580
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5781
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
89+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
5890
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5991
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6092
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6193
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6294
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6495
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
96+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7298
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
81100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
82101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
83102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
86104
</content>
87-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
105+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
88106
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
90-
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
91-
<orderEntry type="library" exported="" name="kotlin-runtime-0.11.91.2" level="project" />
92-
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
93-
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
107+
<orderEntry type="library" exported="" name="kotlin-stdlib-1.1.2" level="project" />
94108
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
95-
<orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91.2" level="project" />
109+
<orderEntry type="library" exported="" name="annotations-13.0" level="project" />
110+
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
114+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
116+
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
117+
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
118+
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
119+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
120+
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
96121
</component>
97-
</module>
98-
122+
</module>

‎OkHttp_AsyncTask/app/build.gradle‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
34

45
android {
5-
compileSdkVersion 22
6-
buildToolsVersion "22.0.1"
6+
compileSdkVersion 25
7+
buildToolsVersion "25.0.3"
78

89
defaultConfig {
910
applicationId "com.irontec.kotlintest"
1011
minSdkVersion 16
11-
targetSdkVersion 22
12+
targetSdkVersion 25
1213
versionCode 1
1314
versionName "1.0"
1415
}
@@ -25,19 +26,11 @@ android {
2526

2627
dependencies {
2728
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
compile 'com.android.support:appcompat-v7:22.0.0'
29+
compile 'com.android.support:appcompat-v7:25.3.1'
2930
compile 'com.squareup.okhttp:okhttp:2.3.0'
3031
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3132
}
32-
buildscript {
33-
ext.kotlin_version = '0.11.91.2'
34-
repositories {
35-
mavenCentral()
36-
}
37-
dependencies {
38-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
39-
}
40-
}
33+
4134
repositories {
4235
mavenCentral()
4336
}

‎OkHttp_AsyncTask/app/src/main/java/com/irontec/kotlintest/MainActivity.kt‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,60 @@
11
package com.irontec.kotlintest
22

33
import android.os.AsyncTask
4-
import android.support.v7.app.ActionBarActivity
54
import android.os.Bundle
6-
import android.util.Log
5+
import android.support.v7.app.AppCompatActivity
76
import android.view.Menu
87
import android.view.MenuItem
98
import android.widget.TextView
109
import com.irontec.kotlintest.networking.NetworkClient
11-
import org.json.JSONObject
10+
import kotlinx.android.synthetic.main.activity_main.*
1211
import java.io.BufferedInputStream
1312
import java.io.BufferedReader
1413
import java.io.InputStreamReader
15-
import java.net.HttpURLConnection
16-
import java.net.URL
17-
18-
19-
public class MainActivity : ActionBarActivity() {
20-
21-
open val mTextView: TextView
22-
get() {
23-
return findViewById(R.id.text) as TextView
24-
}
2514

15+
class MainActivity : AppCompatActivity() {
2616

2717
override fun onCreate(savedInstanceState: Bundle?) {
2818
super.onCreate(savedInstanceState)
2919
setContentView(R.layout.activity_main)
3020

31-
GetJsonWithOkHttpClient(mTextView).execute()
21+
GetJsonWithOkHttpClient(this.text).execute()
3222

3323
}
3424

35-
open class GetJsonWithOkHttpClient(textView: TextView) : AsyncTask<Void, Void, String>() {
25+
open class GetJsonWithOkHttpClient(textView: TextView) : AsyncTask<Unit, Unit, String>() {
3626

3727
val mInnerTextView = textView
3828

39-
override fun doInBackground(vararg params: Void?): String? {
29+
override fun doInBackground(vararg params: Unit?): String? {
4030
val networkClient = NetworkClient()
4131
val stream = BufferedInputStream(
4232
networkClient.get("https://raw.githubusercontent.com/irontec/android-kotlin-samples/master/common-data/bilbao.json"))
43-
return readStream(stream);
33+
return readStream(stream)
4434
}
4535

4636
override fun onPostExecute(result: String?) {
4737
super.onPostExecute(result)
4838

49-
mInnerTextView.setText(result)
39+
mInnerTextView.text = result
5040

5141
}
5242

5343
fun readStream(inputStream: BufferedInputStream): String {
54-
val bufferedReader = BufferedReader(InputStreamReader(inputStream));
55-
val stringBuilder = StringBuilder();
44+
val bufferedReader = BufferedReader(InputStreamReader(inputStream))
45+
val stringBuilder = StringBuilder()
5646
bufferedReader.forEachLine { stringBuilder.append(it) }
5747
return stringBuilder.toString()
5848
}
5949
}
6050

6151
override fun onCreateOptionsMenu(menu: Menu): Boolean {
62-
getMenuInflater().inflate(R.menu.menu_main, menu)
52+
menuInflater.inflate(R.menu.menu_main, menu)
6353
return true
6454
}
6555

6656
override fun onOptionsItemSelected(item: MenuItem): Boolean {
67-
val id = item.getItemId()
57+
val id = item.itemId
6858
if (id == R.id.action_settings) {
6959
return true
7060
}

‎OkHttp_AsyncTask/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
5+
ext.kotlin_version = '1.1.2'
6+
47
repositories {
58
jcenter()
69
}
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.1.0'
910

11+
dependencies {
12+
classpath 'com.android.tools.build:gradle:2.3.3'
13+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1014
// NOTE: Do not place your application dependencies here; they belong
1115
// in the individual module build.gradle files
1216
}

‎OkHttp_AsyncTask/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Thu Jun 15 09:09:03 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)