Skip to content

Commit 2b542b9

Browse files
committed
Update basic project
1 parent fe4d0f3 commit 2b542b9

File tree

5 files changed

+17
-21
lines changed

5 files changed

+17
-21
lines changed

Basic/.gitignore

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

3737
# Intellij
3838
*.iml
39-
.idea/workspace.xml
39+
.idea/*
4040
.idea/tasks.xml
41-
.idea/gradle.xml
4241
.idea/dictionaries
43-
.idea/libraries
44-
.idea/misc.xml
45-
.idea/modules.xml
46-
.idea/runConfigurations.xml
47-
.idea/vcs.xml
4842

4943
# Keystore files
5044
*.jks

Basic/app/build.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ apply plugin: 'kotlin-android'
44

55
apply plugin: 'kotlin-android-extensions'
66

7-
ext.arch_version = "1.0.0-beta2"
7+
ext.support_version = "27.1.0"
8+
ext.arch_version = "1.1.1"
9+
ext.room_version = "1.0.0"
810
ext.retrofit_version = "2.3.0"
911

1012
android {
11-
compileSdkVersion 26
12-
buildToolsVersion '26.0.2'
13+
compileSdkVersion 27
14+
buildToolsVersion "27.0.3"
1315
defaultConfig {
1416
//TODO: Update applicationId
1517
applicationId "com.snappymob.kotlincomponents"
1618
minSdkVersion 16
17-
targetSdkVersion 26
19+
targetSdkVersion 27
1820
versionCode 1
1921
versionName "1.0"
2022
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,8 +32,8 @@ android {
3032

3133
dependencies {
3234
implementation fileTree(dir: 'libs', include: ['*.jar'])
33-
implementation 'com.android.support:appcompat-v7:26.1.0'
34-
implementation 'com.android.support:recyclerview-v7:26.1.0'
35+
implementation "com.android.support:appcompat-v7:$support_version"
36+
implementation "com.android.support:recyclerview-v7:$support_version"
3537
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
3638
testImplementation 'junit:junit:4.12'
3739
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
@@ -44,8 +46,8 @@ dependencies {
4446
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
4547

4648
//Room
47-
implementation "android.arch.persistence.room:runtime:$arch_version"
48-
kapt "android.arch.persistence.room:compiler:$arch_version"
49+
implementation "android.arch.persistence.room:runtime:$room_version"
50+
kapt "android.arch.persistence.room:compiler:$room_version"
4951

5052
//Lifecycle
5153
implementation "android.arch.lifecycle:runtime:$arch_version"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import kotlinx.android.synthetic.main.activity_main.*
2525
*/
2626
class MainActivity : AppCompatActivity() {
2727

28-
private lateinit var repoViewModel:RepoViewModel
28+
private lateinit var repoViewModel: RepoViewModel
2929

3030
private val USER_STATE_KEY = "UserName"
3131

@@ -89,7 +89,7 @@ class MainActivity : AppCompatActivity() {
8989
outState?.putString(USER_STATE_KEY, repoViewModel.currentRepoUser)
9090
}
9191

92-
class ReposAdapter(val context: Context, var repos: ArrayList<Repo>) : RecyclerView.Adapter<ReposAdapter.RepoItemViewHolder>() {
92+
class ReposAdapter(private val context: Context, private var repos: ArrayList<Repo>) : RecyclerView.Adapter<ReposAdapter.RepoItemViewHolder>() {
9393

9494
override fun getItemCount(): Int {
9595
return repos.size
@@ -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)

Basic/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 11:13:37 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)