From 4b7808fbd59eef24e683034bb4c1549a075d73b2 Mon Sep 17 00:00:00 2001 From: "lucas.campos" Date: Mon, 9 Oct 2017 16:05:03 -0300 Subject: [PATCH 1/4] update project --- app/build.gradle | 2 +- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aca270e..612b1ed 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.1' + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.example.android.sunshine" diff --git a/build.gradle b/build.gradle index e773608..012b4ef 100755 --- a/build.gradle +++ b/build.gradle @@ -6,16 +6,16 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta2' + classpath 'com.android.tools.build:gradle:3.0.0-beta7' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } -ext.arch_version = "1.0.0-alpha8" -ext.support_version = "26.0.1" -ext.constraint_layout_version = "1.1.0-beta1" +ext.arch_version = "1.0.0-alpha9-1" +ext.support_version = "26.1.0" +ext.constraint_layout_version = "1.1.0-beta2" ext.firebase_jobdispatcher_version = "0.7.0" ext.junit_version = "4.12" ext.support_test_version = "1.0.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c8d55e4..f2cf2b3 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 03 09:55:05 PDT 2017 +#Mon Oct 09 15:17:20 BRT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From 8032b1e5becf47a889de91fc333150004936f8a4 Mon Sep 17 00:00:00 2001 From: "lucas.campos" Date: Mon, 9 Oct 2017 16:21:13 -0300 Subject: [PATCH 2/4] introduction to room --- app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 612b1ed..5f3a7ad 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,6 +39,9 @@ dependencies { compile "android.arch.persistence.room:runtime:$arch_version" annotationProcessor "android.arch.persistence.room:compiler:$arch_version" + compile "android.arch.persistence.room:runtime:1.0.0-alpha9-1" + annotationProcessor "android.arch.persistence.room:compiler:1.0.0-alpha9-1" + // Instrumentation dependencies use androidTestCompile" // (as opposed to testCompile for local unit tests run in the JVM" androidTestCompile "junit:junit:$junit_version" From f9a2ed17b838583c8cd25380478e88fe7f88fb22 Mon Sep 17 00:00:00 2001 From: "lucas.campos" Date: Mon, 9 Oct 2017 16:57:13 -0300 Subject: [PATCH 3/4] update libs version --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5f3a7ad..612b1ed 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,9 +39,6 @@ dependencies { compile "android.arch.persistence.room:runtime:$arch_version" annotationProcessor "android.arch.persistence.room:compiler:$arch_version" - compile "android.arch.persistence.room:runtime:1.0.0-alpha9-1" - annotationProcessor "android.arch.persistence.room:compiler:1.0.0-alpha9-1" - // Instrumentation dependencies use androidTestCompile" // (as opposed to testCompile for local unit tests run in the JVM" androidTestCompile "junit:junit:$junit_version" From 3a0aca7942c1fe9d663857a279688b6c18f63dc5 Mon Sep 17 00:00:00 2001 From: "lucas.campos" Date: Tue, 10 Oct 2017 11:37:02 -0300 Subject: [PATCH 4/4] remove deprecated code --- .../example/android/sunshine/ui/detail/DetailActivity.java | 4 ++-- .../com/example/android/sunshine/ui/list/MainActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/android/sunshine/ui/detail/DetailActivity.java b/app/src/main/java/com/example/android/sunshine/ui/detail/DetailActivity.java index f3dc2b7..860d593 100755 --- a/app/src/main/java/com/example/android/sunshine/ui/detail/DetailActivity.java +++ b/app/src/main/java/com/example/android/sunshine/ui/detail/DetailActivity.java @@ -15,10 +15,10 @@ */ package com.example.android.sunshine.ui.detail; -import android.arch.lifecycle.LifecycleActivity; import android.arch.lifecycle.ViewModelProviders; import android.databinding.DataBindingUtil; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import com.example.android.sunshine.R; import com.example.android.sunshine.data.database.WeatherEntry; @@ -32,7 +32,7 @@ /** * Displays single day's forecast */ -public class DetailActivity extends LifecycleActivity { +public class DetailActivity extends AppCompatActivity { public static final String WEATHER_ID_EXTRA = "WEATHER_ID_EXTRA"; diff --git a/app/src/main/java/com/example/android/sunshine/ui/list/MainActivity.java b/app/src/main/java/com/example/android/sunshine/ui/list/MainActivity.java index 70f21eb..76e2738 100755 --- a/app/src/main/java/com/example/android/sunshine/ui/list/MainActivity.java +++ b/app/src/main/java/com/example/android/sunshine/ui/list/MainActivity.java @@ -15,10 +15,10 @@ */ package com.example.android.sunshine.ui.list; -import android.arch.lifecycle.LifecycleActivity; import android.arch.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -34,7 +34,7 @@ /** * Displays a list of the next 14 days of forecasts */ -public class MainActivity extends LifecycleActivity implements +public class MainActivity extends AppCompatActivity implements ForecastAdapter.ForecastAdapterOnItemClickHandler { private ForecastAdapter mForecastAdapter;