Skip to content

Commit 1dde972

Browse files
committed
upgraded kotlin version to 1.4.32
1 parent c922389 commit 1dde972

File tree

5 files changed

+31
-25
lines changed

5 files changed

+31
-25
lines changed

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply plugin: 'kotlin-kapt'
4+
apply plugin: 'kotlin-parcelize'
5+
56

67
android {
78
compileSdkVersion 29
@@ -29,8 +30,9 @@ android {
2930
targetCompatibility JavaVersion.VERSION_1_8
3031
}
3132

32-
androidExtensions {
33-
experimental = true
33+
34+
buildFeatures {
35+
dataBinding true
3436
}
3537
}
3638

app/src/main/java/com/zoomcar/networkclient/MainActivity.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ package com.zoomcar.networkclient
33
import android.os.Bundle
44
import android.util.Log
55
import androidx.appcompat.app.AppCompatActivity
6+
import androidx.databinding.DataBindingUtil
67
import com.bluelinelabs.logansquare.LoganSquare
78
import com.google.gson.JsonElement
9+
import com.zoomcar.networkclient.databinding.ActivityMainBinding
810
import com.zoomcar.zcnetwork.core.ZcNetworkBuilder
911
import com.zoomcar.zcnetwork.core.ZcNetworkListener
1012
import com.zoomcar.zcnetwork.error.NetworkError
1113
import com.zoomcar.zcnetwork.utils.LibTag
1214
import com.zoomcar.zcnetwork.utils.ZcRequestType
13-
import kotlinx.android.synthetic.main.activity_main.*
1415

1516
class MainActivity : AppCompatActivity() {
1617

1718
override fun onCreate(savedInstanceState: Bundle?) {
1819
super.onCreate(savedInstanceState)
19-
setContentView(R.layout.activity_main)
20-
button.setOnClickListener {
20+
val binding: ActivityMainBinding =
21+
DataBindingUtil.setContentView(this, R.layout.activity_main)
22+
binding.button.setOnClickListener {
2123
val zcNetworkBuilder: ZcNetworkBuilder = ZcNetworkBuilder()
2224
.setActivity(this)
2325
.setBodyParams(hashMapOf("title" to "foo", "body" to "bar", "userId" to 1))
Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
tools:context=".MainActivity">
2+
<layout>
3+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
xmlns:tools="http://schemas.android.com/tools"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
tools:context=".MainActivity">
89

9-
<androidx.appcompat.widget.AppCompatButton
10-
android:id="@+id/button"
11-
android:layout_width="wrap_content"
12-
android:layout_height="wrap_content"
13-
android:text="Press Me!"
14-
app:layout_constraintBottom_toBottomOf="parent"
15-
app:layout_constraintLeft_toLeftOf="parent"
16-
app:layout_constraintRight_toRightOf="parent"
17-
app:layout_constraintTop_toTopOf="parent" />
10+
<androidx.appcompat.widget.AppCompatButton
11+
android:id="@+id/button"
12+
android:layout_width="wrap_content"
13+
android:layout_height="wrap_content"
14+
android:text="Press Me!"
15+
app:layout_constraintBottom_toBottomOf="parent"
16+
app:layout_constraintLeft_toLeftOf="parent"
17+
app:layout_constraintRight_toRightOf="parent"
18+
app:layout_constraintTop_toTopOf="parent" />
1819

19-
</androidx.constraintlayout.widget.ConstraintLayout>
20+
</androidx.constraintlayout.widget.ConstraintLayout>
21+
</layout>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = "1.3.61"
3+
ext.kotlin_version = "1.4.32"
44
repositories {
55
google()
66
jcenter()

zcnetwork/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-kapt'
32
apply plugin: 'kotlin-android'
4-
apply plugin: 'kotlin-android-extensions'
3+
apply plugin: 'kotlin-kapt'
4+
apply plugin: 'kotlin-parcelize'
55

66
android {
77
compileSdkVersion 28

0 commit comments

Comments
 (0)