Skip to content

Commit 9b56e8b

Browse files
committed
updated gradle files, added NPE Todo
1 parent e1d146e commit 9b56e8b

File tree

7 files changed

+7
-30
lines changed

7 files changed

+7
-30
lines changed

CameraModule/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'android-library'
1+
apply plugin: 'com.android.library'
22

33
repositories {
44
mavenCentral()
@@ -30,6 +30,6 @@ android {
3030
dependencies {
3131
compile 'com.edmodo:cropper:1.0.1'
3232
compile 'com.squareup.picasso:picasso:2.2.0'
33-
compile 'com.jakewharton.timber:timber:2.2.+'
33+
compile 'com.jakewharton.timber:timber:2.2.2'
3434
compile fileTree(dir: 'libs', include: ['*.jar'])
3535
}

CameraModule/src/main/java/com/yalantis/cameramodule/util/RotatePhotoTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public RotatePhotoTask(String path, float angle, PhotoSavedListener callback) {
5151

5252
@Override
5353
protected Void doInBackground(Void... params) {
54-
Bitmap bitmap = BitmapFactory.decodeFile(path);
54+
Bitmap bitmap = BitmapFactory.decodeFile(path); // todo NPE
5555
Matrix matrix = new Matrix();
5656
matrix.postRotate(angle);
5757
bitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ buildscript {
2828
mavenCentral()
2929
}
3030
dependencies {
31-
classpath 'com.android.tools.build:gradle:0.10.+'
31+
classpath 'com.android.tools.build:gradle:0.13.0'
3232
}
3333
}
3434

gradle/wrapper/gradle-wrapper.jar

1.18 KB
Binary file not shown.
+2-25
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,6 @@
1-
#
2-
# The MIT License (MIT)
3-
#
4-
# Copyright (c) 2014 Zillow
5-
#
6-
# Permission is hereby granted, free of charge, to any person obtaining a copy
7-
# of this software and associated documentation files (the "Software"), to deal
8-
# in the Software without restriction, including without limitation the rights
9-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
# copies of the Software, and to permit persons to whom the Software is furnished
11-
# to do so, subject to the following conditions:
12-
#
13-
# The above copyright notice and this permission notice shall be included in all
14-
# copies or substantial portions of the Software.
15-
#
16-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20-
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21-
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22-
#
23-
24-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Tue Oct 07 11:53:37 EEST 2014
252
distributionBase=GRADLE_USER_HOME
263
distributionPath=wrapper/dists
274
zipStoreBase=GRADLE_USER_HOME
285
zipStorePath=wrapper/dists
29-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip

gradlew

100644100755
File mode changed.

sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
*/
2323

24-
apply plugin: 'android'
24+
apply plugin: 'com.android.application'
2525

2626
repositories {
2727
mavenCentral()

0 commit comments

Comments
 (0)