Skip to content

Commit 395e759

Browse files
committed
Update BasicRx
1 parent 2b542b9 commit 395e759

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

BasicRx/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ captures/
3636

3737
# Intellij
3838
*.iml
39-
.idea/workspace.xml
39+
.idea/*
4040
.idea/tasks.xml
4141
.idea/gradle.xml
4242
.idea/dictionaries

BasicRx/app/build.gradle

+13-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
ext.dagger_version = "2.11"
8-
ext.arch_version = "1.0.0-beta2"
8+
ext.support_version = "27.1.0"
9+
ext.arch_version = "1.1.1"
10+
ext.room_version = "1.0.0"
911
ext.retrofit_version = "2.3.0"
1012

1113
android {
12-
compileSdkVersion 26
13-
buildToolsVersion '26.0.2'
14+
compileSdkVersion 27
15+
buildToolsVersion '27.0.3'
1416
defaultConfig {
1517
//TODO: Update applicationId
1618
applicationId "com.snappymob.kotlincomponents.rx"
1719
minSdkVersion 16
18-
targetSdkVersion 26
20+
targetSdkVersion 27
1921
versionCode 1
2022
versionName "1.0"
2123
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -31,8 +33,8 @@ android {
3133

3234
dependencies {
3335
implementation fileTree(dir: 'libs', include: ['*.jar'])
34-
implementation 'com.android.support:appcompat-v7:26.1.0'
35-
implementation 'com.android.support:recyclerview-v7:26.1.0'
36+
implementation "com.android.support:appcompat-v7:$support_version"
37+
implementation "com.android.support:recyclerview-v7:$support_version"
3638
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
3739
testImplementation 'junit:junit:4.12'
3840
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
@@ -46,18 +48,18 @@ dependencies {
4648
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
4749

4850
//Room
49-
implementation "android.arch.persistence.room:runtime:$arch_version"
50-
kapt "android.arch.persistence.room:compiler:$arch_version"
51-
compile "android.arch.persistence.room:rxjava2:$arch_version"
51+
implementation "android.arch.persistence.room:runtime:$room_version"
52+
kapt "android.arch.persistence.room:compiler:$room_version"
53+
compile "android.arch.persistence.room:rxjava2:$room_version"
5254

5355
//Lifecycle
5456
implementation "android.arch.lifecycle:runtime:$arch_version"
5557
implementation "android.arch.lifecycle:extensions:$arch_version"
5658
kapt "android.arch.lifecycle:compiler:$arch_version"
5759

5860
//Rx
59-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
60-
compile 'io.reactivex.rxjava2:rxkotlin:2.1.0'
61+
compile 'io.reactivex.rxjava2:rxandroid:2.0.2'
62+
compile 'io.reactivex.rxjava2:rxkotlin:2.2.0'
6163

6264
}
6365

BasicRx/app/src/main/java/com/snappymob/kotlincomponents/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class MainActivity : AppCompatActivity() {
100100
notifyDataSetChanged()
101101
}
102102

103-
override fun onCreateViewHolder(p0: ViewGroup?, p1: Int): RepoItemViewHolder {
103+
override fun onCreateViewHolder(p0: ViewGroup, p1: Int): RepoItemViewHolder {
104104
val textView = TextView(context)
105105

106106
return RepoItemViewHolder(textView)

BasicRx/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.0-rc1'
10+
classpath 'com.android.tools.build:gradle:3.1.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Sep 09 10:33:57 MYT 2017
1+
#Sat Mar 31 13:11:50 MYT 2018
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-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)