Skip to content

Commit 1df9070

Browse files
committed
Squashed commit of the following:
commit aed49e2 Author: John <[email protected]> Date: Thu Mar 9 01:43:57 2017 -0600 Remove Apache dependency to allow for higher Android target SDK. (parse-community#554) * Remove Apache dependency to allow for higher Android target SDK. * Remove ParseURLConnectionHttpClient in favor of ParseOkHttpClient * Add JDK specification to Travis * Assure the latest tools are installed * Update to the latest dependencies * Update so that the notification is built properly commit 93dbb83 Author: Roger Hu <[email protected]> Date: Wed Mar 8 23:26:11 2017 -0800 Bump to 1.14.1 snapshot commit 5bacd08 Author: Roger Hu <[email protected]> Date: Wed Mar 8 17:36:50 2017 -0800 Bump to v1.13.3 release commit 735be49 Author: Mattia <[email protected]> Date: Thu Mar 9 02:34:25 2017 +0100 Closing streams in ParseAWSRequest (parse-community#590) * Update ParseAWSRequest.java commit 3fced98 Author: Florent Vilmart <[email protected]> Date: Wed Mar 8 20:33:32 2017 -0500 Create .codecov.yml (parse-community#594) commit ea489eb Merge: 5434260 b6c98bd Author: Roger Hu <[email protected]> Date: Wed Mar 8 12:15:29 2017 -0800 Merge pull request parse-community#592 from rogerhu/1.13.3 Bump to v1.13.3-SNAPSHOT commit b6c98bd Author: Roger Hu <[email protected]> Date: Wed Mar 8 12:14:17 2017 -0800 Bump to v1.13.3-SNAPSHOT commit 5434260 Merge: 64e74dc 2f2d856 Author: Roger Hu <[email protected]> Date: Wed Mar 8 12:10:59 2017 -0800 Merge pull request parse-community#591 from rogerhu/1.13.2 Bump to v1.13.2 release commit 2f2d856 Author: Roger Hu <[email protected]> Date: Wed Mar 8 12:08:55 2017 -0800 Bump to v1.13.2 release commit 64e74dc Merge: fe08345 f78a722 Author: Roger Hu <[email protected]> Date: Wed Mar 8 12:06:09 2017 -0800 Merge pull request parse-community#506 from posativ/patch-1 only add client key if non-null commit f78a722 Author: Martin Zimmermann <[email protected]> Date: Wed Jul 27 14:29:25 2016 +0200 only add client key if non-null
1 parent 7b92004 commit 1df9070

40 files changed

+137
-886
lines changed

.codecov.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
coverage:
2+
precision: 2
3+
round: down
4+
range: "45...100"
5+
6+
status:
7+
project: yes
8+
patch: yes
9+
changes: no

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ branches:
55
language: android
66
sudo: false
77

8+
jdk:
9+
- oraclejdk8
10+
811
android:
912
components:
10-
- build-tools-23.0.1
11-
- android-22
12-
- doc-23
13-
- extra-android-support
13+
- tools
14+
- platform-tools
15+
- build-tools-25.0.2
16+
- android-25
17+
- doc-25
1418
- extra-android-m2repository
1519

1620
before_install:

Parse/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ apply plugin: 'com.android.library'
44
apply plugin: 'com.github.kt3k.coveralls'
55

66
group = 'com.parse'
7-
version = '1.13.2-SNAPSHOT'
7+
version = '1.14.1-SNAPSHOT'
88

99
buildscript {
1010
repositories {
11-
mavenCentral()
11+
jcenter()
1212
}
1313

1414
dependencies {
15-
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x'
15+
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
1616
}
1717
}
1818

@@ -39,16 +39,16 @@ android {
3939
}
4040
}
4141

42+
ext.okhttpVersion = '3.6.0'
4243
dependencies {
4344
compile 'com.parse.bolts:bolts-tasks:1.4.0'
45+
compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
46+
provided 'com.facebook.stetho:stetho:1.4.2'
4447

45-
provided 'com.squareup.okhttp3:okhttp:3.3.1'
46-
provided 'com.facebook.stetho:stetho:1.3.0'
47-
48-
testCompile 'org.robolectric:robolectric:3.0'
49-
testCompile 'org.skyscreamer:jsonassert:1.2.3'
48+
testCompile 'org.robolectric:robolectric:3.3'
49+
testCompile 'org.skyscreamer:jsonassert:1.4.0'
5050
testCompile 'org.mockito:mockito-core:1.10.19'
51-
testCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
51+
testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
5252
}
5353

5454
android.libraryVariants.all { variant ->

Parse/src/main/java/com/parse/NotificationCompat.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,22 @@
5050
private static final NotificationCompatImpl IMPL;
5151

5252
interface NotificationCompatImpl {
53-
public Notification build(Builder b);
53+
Notification build(Builder b);
5454
}
5555

5656
static class NotificationCompatImplBase implements NotificationCompatImpl {
5757
@Override
58-
public Notification build(Builder b) {
59-
Notification result = (Notification) b.mNotification;
60-
result.setLatestEventInfo(b.mContext, b.mContentTitle, b.mContentText, b.mContentIntent);
58+
public Notification build(Builder builder) {
59+
Notification result = builder.mNotification;
60+
NotificationCompat.Builder newBuilder = new NotificationCompat.Builder(builder.mContext);
61+
newBuilder.setContentTitle(builder.mContentTitle);
62+
newBuilder.setContentText(builder.mContentText);
63+
newBuilder.setContentIntent(builder.mContentIntent);
6164
// translate high priority requests into legacy flag
62-
if (b.mPriority > PRIORITY_DEFAULT) {
65+
if (builder.mPriority > PRIORITY_DEFAULT) {
6366
result.flags |= FLAG_HIGH_PRIORITY;
6467
}
65-
return result;
68+
return newBuilder.build();
6669
}
6770
}
6871

Parse/src/main/java/com/parse/ParseApacheHttpClient.java

Lines changed: 0 additions & 247 deletions
This file was deleted.

0 commit comments

Comments
 (0)