From 66aa6efb5cbdc6e612c9987bd2021aa764233f13 Mon Sep 17 00:00:00 2001 From: Axier Fernandez Date: Thu, 24 May 2018 13:02:01 +0200 Subject: [PATCH] Updated libraries and dependencies. --- .idea/__vcs.xml | 6 - .idea/codeStyles/Project.xml | 53 ++ .idea/dbnavigator.xml | 454 ++++++++++++++++++ .idea/misc.xml | 7 +- .idea/modules.xml | 2 +- app/build.gradle | 47 +- .../service/repository/GitHubService.java | 2 +- .../mvvmsampleapp/view/ui/MainActivity.java | 4 +- .../view/ui/ProjectFragment.java | 4 +- .../view/ui/ProjectListFragment.java | 4 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 12 files changed, 546 insertions(+), 43 deletions(-) delete mode 100644 .idea/__vcs.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/dbnavigator.xml diff --git a/.idea/__vcs.xml b/.idea/__vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/__vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..3cad2b3 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..369900a --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,454 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fee3a84..199f869 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index bd4fb0f..567a97a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ceb69ee..db03d59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,20 +1,20 @@ project.ext { - appcompat = "25.3.1" - arch = "1.0.0-alpha1" - retrofit = "2.0.2" - constraintLayout = "1.0.2" + support = "27.1.1" + arch = "1.1.1" + retrofit = "2.4.0" + constraintLayout = "1.1.0" dagger_version = "2.11" } apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.example.test.mvvm_sample_app" minSdkVersion 19 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -36,29 +36,30 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "com.android.support:appcompat-v7:$project.appcompat" - compile "com.android.support:cardview-v7:$project.appcompat" - compile "com.android.support:recyclerview-v7:$project.appcompat" - compile "android.arch.lifecycle:runtime:$project.arch" - compile "android.arch.lifecycle:extensions:$project.arch" - compile "com.squareup.retrofit2:retrofit:$project.retrofit" - compile "com.squareup.retrofit2:converter-gson:$project.retrofit" + implementation "com.android.support:appcompat-v7:$project.support" + implementation "com.android.support:design:$project.support" + implementation "com.android.support:cardview-v7:$project.support" + implementation "com.android.support:recyclerview-v7:$project.support" + implementation "com.android.support:support-v4:$project.support" + implementation "com.android.support.constraint:constraint-layout:$project.constraintLayout" + + implementation "android.arch.lifecycle:runtime:$project.arch" + implementation "android.arch.lifecycle:extensions:$project.arch" + implementation "com.squareup.retrofit2:retrofit:$project.retrofit" + implementation "com.squareup.retrofit2:converter-gson:$project.retrofit" annotationProcessor "android.arch.lifecycle:compiler:$project.arch" - compile "com.android.support.constraint:constraint-layout:$project.constraintLayout" - compile "com.android.support:support-v4:$project.appcompat" - compile "com.google.dagger:dagger:$project.dagger_version" - compile "com.google.dagger:dagger-android:$project.dagger_version" - compile "com.google.dagger:dagger-android-support:$project.dagger_version" + implementation "com.google.dagger:dagger:$project.dagger_version" + implementation "com.google.dagger:dagger-android:$project.dagger_version" + implementation "com.google.dagger:dagger-android-support:$project.dagger_version" annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version" - testCompile 'junit:junit:4.12' - compile 'com.android.support:design:25.3.1' + testImplementation 'junit:junit:4.12' } diff --git a/app/src/main/java/com/example/test/mvvmsampleapp/service/repository/GitHubService.java b/app/src/main/java/com/example/test/mvvmsampleapp/service/repository/GitHubService.java index a1fccc9..078f6bc 100644 --- a/app/src/main/java/com/example/test/mvvmsampleapp/service/repository/GitHubService.java +++ b/app/src/main/java/com/example/test/mvvmsampleapp/service/repository/GitHubService.java @@ -14,6 +14,6 @@ public interface GitHubService { @GET("users/{user}/repos") Call> getProjectList(@Path("user") String user); - @GET("/repos/{user}/{reponame}") + @GET("repos/{user}/{reponame}") Call getProjectDetails(@Path("user") String user, @Path("reponame") String projectName); } diff --git a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/MainActivity.java b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/MainActivity.java index 3c8e58b..b00f0e9 100755 --- a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/MainActivity.java +++ b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/MainActivity.java @@ -1,9 +1,9 @@ package com.example.test.mvvmsampleapp.view.ui; -import android.arch.lifecycle.LifecycleActivity; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; import com.example.test.mvvmsampleapp.R; import com.example.test.mvvmsampleapp.service.model.Project; @@ -13,7 +13,7 @@ import dagger.android.DispatchingAndroidInjector; import dagger.android.support.HasSupportFragmentInjector; -public class MainActivity extends LifecycleActivity implements HasSupportFragmentInjector { +public class MainActivity extends AppCompatActivity implements HasSupportFragmentInjector { @Inject DispatchingAndroidInjector dispatchingAndroidInjector; diff --git a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectFragment.java b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectFragment.java index e0d8c2f..de554cb 100755 --- a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectFragment.java +++ b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectFragment.java @@ -1,12 +1,12 @@ package com.example.test.mvvmsampleapp.view.ui; -import android.arch.lifecycle.LifecycleFragment; import android.arch.lifecycle.Observer; import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProviders; import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,7 +19,7 @@ import javax.inject.Inject; -public class ProjectFragment extends LifecycleFragment implements Injectable { +public class ProjectFragment extends Fragment implements Injectable { private static final String KEY_PROJECT_ID = "project_id"; private FragmentProjectDetailsBinding binding; diff --git a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectListFragment.java b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectListFragment.java index 2ed18a4..e31c7f2 100755 --- a/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectListFragment.java +++ b/app/src/main/java/com/example/test/mvvmsampleapp/view/ui/ProjectListFragment.java @@ -1,13 +1,13 @@ package com.example.test.mvvmsampleapp.view.ui; import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleFragment; import android.arch.lifecycle.Observer; import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProviders; import android.databinding.DataBindingUtil; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -24,7 +24,7 @@ import javax.inject.Inject; -public class ProjectListFragment extends LifecycleFragment implements Injectable { +public class ProjectListFragment extends Fragment implements Injectable { public static final String TAG = "ProjectListFragment"; private ProjectAdapter projectAdapter; private FragmentProjectListBinding binding; diff --git a/build.gradle b/build.gradle index fe62d25..1074e96 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha5' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 195cbd3..ddef743 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon May 29 15:39:33 EDT 2017 +#Thu May 24 12:54:18 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip