Skip to content

Commit f504421

Browse files
committed
* Update Gradle
* Delete .idea dir * Add Travis YML * Switch to Glide * Add .gitignore
1 parent d08150d commit f504421

File tree

14 files changed

+88
-139
lines changed

14 files changed

+88
-139
lines changed

Diff for: .gitignore

+63-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,65 @@
1+
# Source: https://gist.github.com/nesquena/5617544/raw/53710b374e7df3302df43b552488d876040ada3d/.gitignore
2+
3+
# built application files
4+
*.apk
5+
*.ap_
6+
7+
# files for the dex VM
8+
*.dex
9+
10+
# Java class files
11+
*.class
12+
13+
# generated files
14+
bin/
15+
gen/
16+
17+
# Local configuration file (sdk path, etc)
18+
local.properties
19+
20+
# Eclipse project files
21+
.classpath
22+
.project
23+
24+
# Proguard folder generated by Eclipse
25+
proguard/
26+
27+
# Intellij project files
28+
*.iml
29+
*.ipr
30+
*.iws
31+
.idea/
32+
33+
*.pydevproject
34+
.project
35+
.metadata
36+
bin/**
37+
tmp/**
38+
tmp/**/*
39+
*.tmp
40+
*.bak
41+
*.swp
42+
*~.nib
43+
local.properties
44+
.classpath
45+
.settings/
46+
.loadpath
47+
48+
# External tool builders
49+
.externalToolBuilders/
50+
51+
# Locally stored "Eclipse launch configurations"
52+
*.launch
53+
54+
# CDT-specific
55+
.cproject
56+
57+
# PDT-specific
58+
.buildpath
59+
60+
# Android Studio project files
161
*.iml
262
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
6-
.DS_Store
7-
/build
8-
/captures
63+
.idea
64+
build
65+
import-summary.txt

Diff for: .idea/.name

-1
This file was deleted.

Diff for: .idea/compiler.xml

-22
This file was deleted.

Diff for: .idea/copyright/profiles_settings.xml

-3
This file was deleted.

Diff for: .idea/encodings.xml

-6
This file was deleted.

Diff for: .idea/gradle.xml

-24
This file was deleted.

Diff for: .idea/misc.xml

-46
This file was deleted.

Diff for: .idea/modules.xml

-9
This file was deleted.

Diff for: .idea/runConfigurations.xml

-12
This file was deleted.

Diff for: .travis.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: android
2+
jdk:
3+
- oraclejdk8
4+
sudo: false
5+
android:
6+
components:
7+
- tools
8+
- platform-tools
9+
- build-tools-25.0.3
10+
- android-25
11+
licenses:
12+
- android-sdk-license-.+
13+
script:
14+
- "./gradlew build check --daemon"
15+
after_failure: "cat $TRAVIS_BUILD_DIR/app/build/outputs/lint-results-debug.xml"

Diff for: app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.0"
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.3"
66

77
defaultConfig {
88
applicationId "com.codepath.debuggingchallenges"
99
minSdkVersion 21
10-
targetSdkVersion 24
10+
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -22,8 +22,8 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
testCompile 'junit:junit:4.12'
25-
compile 'com.android.support:appcompat-v7:24.0.0'
25+
compile 'com.android.support:appcompat-v7:25.3.1'
2626
compile 'com.loopj.android:android-async-http:1.4.9'
27-
compile 'com.squareup.picasso:picasso:2.5.2'
27+
compile 'com.github.bumptech.glide:glide:3.8.0'
2828
compile group: 'com.google.guava', name: 'guava', version: '18.0'
2929
}

Diff for: app/src/main/java/com/codepath/debuggingchallenges/adapters/MoviesAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import android.widget.ImageView;
1111
import android.widget.TextView;
1212

13+
import com.bumptech.glide.Glide;
1314
import com.codepath.debuggingchallenges.R;
1415
import com.codepath.debuggingchallenges.models.Movie;
15-
import com.squareup.picasso.Picasso;
1616

1717
import java.util.List;
1818

@@ -51,7 +51,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
5151
String ratingText = String.format(resources.getString(R.string.rating), movieRating);
5252
tvRating.setText(ratingText);
5353

54-
Picasso.with(getContext()).load(movie.getPosterUrl()).into(ivPoster);
54+
Glide.with(getContext()).load(movie.getPosterUrl()).into(ivPoster);
5555

5656
// Return the completed view to render on screen
5757
return convertView;

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

Diff for: gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Wed Jun 28 06:55:09 PDT 2017
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-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)