Skip to content

Commit f1cd7c2

Browse files
DevMasterTeamDevMasterTeam
committed
Atualização gradle e versão Kotlin
1 parent 5e3d89a commit f1cd7c2

File tree

15 files changed

+23
-34
lines changed

15 files changed

+23
-34
lines changed

‎Apps/GastoViagem/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/GastoViagem/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
66

77
android {
88
compileSdkVersion 29
9-
buildToolsVersion "29.0.0"
9+
buildToolsVersion "29.0.3"
1010
defaultConfig {
1111
applicationId "com.devmasterteam.gastoviagem"
1212
minSdkVersion 19
@@ -27,7 +27,7 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2929
implementation 'androidx.appcompat:appcompat:1.1.0'
30-
implementation 'androidx.core:core-ktx:1.1.0'
30+
implementation 'androidx.core:core-ktx:1.2.0'
3131
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3232
testImplementation 'junit:junit:4.12'
3333
androidTestImplementation 'androidx.test.ext:junit:1.1.1'

‎Apps/GastoViagem/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.3'
11+
classpath 'com.android.tools.build:gradle:3.6.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎Apps/GastoViagem/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 06 00:10:12 BRST 2020
1+
#Sat Mar 07 01:29:20 BRT 2020
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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

‎Apps/LoginMVVM/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/LoginMVVM/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
66

77
android {
88
compileSdkVersion 29
9-
buildToolsVersion "29.0.0"
9+
buildToolsVersion "29.0.3"
1010
defaultConfig {
1111
applicationId "com.devmasterteam.loginmvvm"
1212
minSdkVersion 19
@@ -27,9 +27,9 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2929
implementation 'androidx.appcompat:appcompat:1.1.0'
30-
implementation 'androidx.core:core-ktx:1.1.0'
30+
implementation 'androidx.core:core-ktx:1.2.0'
3131
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
32-
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
32+
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
3333
testImplementation 'junit:junit:4.12'
3434
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3535
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

‎Apps/LoginMVVM/app/src/main/java/com/devmasterteam/loginmvvm/MainActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.view.View
66
import android.widget.Toast
77
import androidx.appcompat.app.AppCompatActivity
88
import androidx.lifecycle.Observer
9-
import androidx.lifecycle.ViewModelProviders
9+
import androidx.lifecycle.ViewModelProvider
1010
import kotlinx.android.synthetic.main.activity_main.*
1111

1212
class MainActivity : AppCompatActivity(), View.OnClickListener {
@@ -20,7 +20,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
2020

2121
// Variáveis
2222
this.mContext = this
23-
this.mMainViewModel = ViewModelProviders.of(this).get(MainViewModel::class.java)
23+
this.mMainViewModel = ViewModelProvider(this).get(MainViewModel::class.java)
2424

2525
// Eventos
2626
buttonLogin.setOnClickListener(this)
@@ -35,10 +35,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
3535
}
3636

3737
fun createObservers() {
38-
mMainViewModel.getWelcome().observe(this, Observer {
38+
mMainViewModel.welcome().observe(this, Observer {
3939
textWelcome.text = it
4040
})
41-
mMainViewModel.getToastNotification().observe(this, Observer {
41+
mMainViewModel.login().observe(this, Observer {
4242
Toast.makeText(mContext, it, Toast.LENGTH_SHORT).show()
4343
})
4444
}

‎Apps/LoginMVVM/app/src/main/java/com/devmasterteam/loginmvvm/MainViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ class MainViewModel : ViewModel() {
1515
mTextWelcome.value = "Bom dia!"
1616
}
1717

18-
fun getWelcome(): LiveData<String> {
18+
fun welcome(): LiveData<String> {
1919
return mTextWelcome
2020
}
2121

22-
fun getToastNotification(): LiveData<String> {
22+
fun login(): LiveData<String> {
2323
return mToastNotification
2424
}
2525

‎Apps/LoginMVVM/app/src/main/java/com/devmasterteam/loginmvvm/PersonRepository.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.devmasterteam.loginmvvm
22

33
class PersonRepository {
4-
fun login(name: String): Boolean {
5-
return name != ""
6-
}
4+
fun login(name: String) = (name != "")
75
}

‎Apps/LoginMVVM/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.3'
11+
classpath 'com.android.tools.build:gradle:3.6.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎Apps/LoginMVVM/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 Jan 08 00:11:46 BRST 2020
1+
#Sat Mar 07 01:30:18 BRT 2020
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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

‎Apps/Motivation/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/Motivation/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
66

77
android {
88
compileSdkVersion 29
9-
buildToolsVersion "29.0.0"
9+
buildToolsVersion "29.0.3"
1010
defaultConfig {
1111
applicationId "com.devmasterteam.motivation"
1212
minSdkVersion 21
@@ -27,7 +27,7 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2929
implementation 'androidx.appcompat:appcompat:1.1.0'
30-
implementation 'androidx.core:core-ktx:1.1.0'
30+
implementation 'androidx.core:core-ktx:1.2.0'
3131
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3232
testImplementation 'junit:junit:4.12'
3333
androidTestImplementation 'androidx.test.ext:junit:1.1.1'

‎Apps/Motivation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88

99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.3'
11+
classpath 'com.android.tools.build:gradle:3.6.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎Apps/Motivation/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 06 00:21:33 BRST 2020
1+
#Sat Mar 07 01:32:05 BRT 2020
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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)