Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update android versions and gradle build tools. #19

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions HackVG/.gitignore
Original file line number Diff line number Diff line change
@@ -6,3 +6,5 @@
/build
*.class
*.jar
HackVG.iml
/.idea
1 change: 0 additions & 1 deletion HackVG/.idea/.name

This file was deleted.

22 changes: 0 additions & 22 deletions HackVG/.idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions HackVG/.idea/copyright/profiles_settings.xml

This file was deleted.

21 changes: 0 additions & 21 deletions HackVG/.idea/gradle.xml

This file was deleted.

38 changes: 0 additions & 38 deletions HackVG/.idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions HackVG/.idea/modules.xml

This file was deleted.

7 changes: 0 additions & 7 deletions HackVG/.idea/vcs.xml

This file was deleted.

19 changes: 0 additions & 19 deletions HackVG/HackVG.iml

This file was deleted.

1 change: 1 addition & 0 deletions HackVG/app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
app.iml
123 changes: 0 additions & 123 deletions HackVG/app/app.iml

This file was deleted.

20 changes: 10 additions & 10 deletions HackVG/app/build.gradle
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 22
buildToolsVersion "22.0.1"

aaptOptions {
useNewCruncher false
@@ -20,7 +20,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

minSdkVersion 16
targetSdkVersion 21
targetSdkVersion 22
versionCode 2
versionName "0.6"
}
@@ -38,19 +38,19 @@ dependencies {
compile project(':domain')

// Google libraries
compile 'com.android.support:cardview-v7:21.0.3'
compile 'com.android.support:appcompat-v7:22.0.0'
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.android.support:palette-v7:21.0.0'
compile 'com.android.support:support-v13:21.0.3'
compile 'com.android.support:support-v4:22.0.0'
compile 'com.android.support:cardview-v7:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:recyclerview-v7:22.1.1'
compile 'com.android.support:palette-v7:22.1.1'
compile 'com.android.support:support-v13:22.1.1'
compile 'com.android.support:support-v4:22.1.1'

// Dagger compiler
apt 'com.google.dagger:dagger-compiler:2.0'

androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.0') {
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.0') {
exclude module: 'support-annotations'
}

Empty file modified HackVG/app/src/main/assets/Lobster-Regular.ttf
100755 → 100644
Empty file.
10 changes: 6 additions & 4 deletions HackVG/app/src/main/java/com/hackvg/android/MoviesApp.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2015 android10.org. All rights reserved.
*
* @author Fernando Cejas (the android10 coder)
*/
package com.hackvg.android;
@@ -16,17 +17,18 @@ public class MoviesApp extends Application {

private AppComponent mAppComponent;

@Override public void onCreate() {
@Override
public void onCreate() {
super.onCreate();
this.initializeDependencyInjector();
}

private void initializeDependencyInjector() {

mAppComponent = DaggerAppComponent.builder()
.applicationModule(new ApplicationModule(this))
.domainModule(new DomainModule())
.build();
.applicationModule(new ApplicationModule(this))
.domainModule(new DomainModule())
.build();
}

public AppComponent getAppComponent() {
Original file line number Diff line number Diff line change
@@ -12,12 +12,13 @@

@Singleton
@Component(modules = {
ApplicationModule.class,
DomainModule.class,
ApplicationModule.class,
DomainModule.class,
})

public interface AppComponent {

Bus bus();

RestMovieSource restMovieSource();
}
Original file line number Diff line number Diff line change
@@ -10,5 +10,5 @@
@Component(dependencies = AppComponent.class, modules = BasicMoviesUsecasesModule.class)
public interface BasicMoviesUsecasesComponent {

void inject (MoviesActivity moviesActivity);
void inject(MoviesActivity moviesActivity);
}
Original file line number Diff line number Diff line change
@@ -6,8 +6,9 @@

import dagger.Component;

@PerActivity @Component(dependencies = AppComponent.class, modules = MovieUsecasesModule.class)
@PerActivity
@Component(dependencies = AppComponent.class, modules = MovieUsecasesModule.class)
public interface MovieUsecasesComponent {

void inject (MovieDetailActivity movieDetailActivity);
void inject(MovieDetailActivity movieDetailActivity);
}
Original file line number Diff line number Diff line change
@@ -19,7 +19,11 @@ public ApplicationModule(MoviesApp application) {
this.application = application;
}

@Provides @Singleton Context provideApplicationContext () { return application; }
@Provides
@Singleton
Context provideApplicationContext() {
return application;
}

public static class MovieUsecasesModule {
}
Loading