diff --git a/Parse/build.gradle b/Parse/build.gradle index 68e8191cb..1f10e6550 100644 --- a/Parse/build.gradle +++ b/Parse/build.gradle @@ -9,20 +9,22 @@ version = '1.13.1-SNAPSHOT' buildscript { repositories { mavenCentral() + jcenter() } dependencies { - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x' + classpath 'com.android.tools.build:gradle:2.1.0-alpha1' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x' } } android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdkVersion rootProject.getProperties().get('compileSdkVersion') + buildToolsVersion rootProject.getProperties().get('buildToolsVersion') defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + minSdkVersion rootProject.getProperties().get('minSdkVersion') + targetSdkVersion rootProject.getProperties().get('targetSdkVersion') versionCode 1 versionName project.version } @@ -36,14 +38,22 @@ android { testCoverageEnabled = true } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + + + useLibrary 'org.apache.http.legacy' } dependencies { + compile 'com.android.tools.build:gradle:2.0.0-beta6' compile 'com.parse.bolts:bolts-tasks:1.4.0' - + compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1' provided 'com.squareup.okhttp:okhttp:2.4.0' provided 'com.facebook.stetho:stetho:1.1.1' - testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.skyscreamer:jsonassert:1.2.3' testCompile 'org.mockito:mockito-core:1.10.19' @@ -204,6 +214,6 @@ task jacocoTestReport(type:JacocoReport, dependsOn: "testDebugUnitTest") { //region Coveralls -coveralls.jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" +//coveralls.jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" //endregion diff --git a/Parse/src/main/java/com/parse/NotificationCompat.java b/Parse/src/main/java/com/parse/NotificationCompat.java index 840025cd7..42051d44a 100644 --- a/Parse/src/main/java/com/parse/NotificationCompat.java +++ b/Parse/src/main/java/com/parse/NotificationCompat.java @@ -57,7 +57,10 @@ static class NotificationCompatImplBase implements NotificationCompatImpl { @Override public Notification build(Builder b) { Notification result = (Notification) b.mNotification; - result.setLatestEventInfo(b.mContext, b.mContentTitle, b.mContentText, b.mContentIntent); + Notification.Builder builder = new Notification.Builder(b.mContext); + builder.setContentTitle(b.mContentTitle); + builder.setContentText(b.mContentText); + builder.setContentIntent(b.mContentIntent); // translate high priority requests into legacy flag if (b.mPriority > PRIORITY_DEFAULT) { result.flags |= FLAG_HIGH_PRIORITY; @@ -73,20 +76,20 @@ static class NotificationCompatPostJellyBean implements NotificationCompatImpl { public Notification build(Builder b) { postJellyBeanBuilder = new Notification.Builder(b.mContext); postJellyBeanBuilder.setContentTitle(b.mContentTitle) - .setContentText(b.mContentText) - .setTicker(b.mNotification.tickerText) - .setSmallIcon(b.mNotification.icon, b.mNotification.iconLevel) - .setContentIntent(b.mContentIntent) - .setDeleteIntent(b.mNotification.deleteIntent) - .setAutoCancel((b.mNotification.flags & Notification.FLAG_AUTO_CANCEL) != 0) - .setLargeIcon(b.mLargeIcon) - .setDefaults(b.mNotification.defaults); + .setContentText(b.mContentText) + .setTicker(b.mNotification.tickerText) + .setSmallIcon(b.mNotification.icon, b.mNotification.iconLevel) + .setContentIntent(b.mContentIntent) + .setDeleteIntent(b.mNotification.deleteIntent) + .setAutoCancel((b.mNotification.flags & Notification.FLAG_AUTO_CANCEL) != 0) + .setLargeIcon(b.mLargeIcon) + .setDefaults(b.mNotification.defaults); if (b.mStyle != null) { if (b.mStyle instanceof Builder.BigTextStyle) { Builder.BigTextStyle staticStyle = (Builder.BigTextStyle) b.mStyle; Notification.BigTextStyle style = new Notification.BigTextStyle(postJellyBeanBuilder) - .setBigContentTitle(staticStyle.mBigContentTitle) - .bigText(staticStyle.mBigText); + .setBigContentTitle(staticStyle.mBigContentTitle) + .bigText(staticStyle.mBigText); if (staticStyle.mSummaryTextSet) { style.setSummaryText(staticStyle.mSummaryText); } diff --git a/Parse/src/main/java/com/parse/ParseApacheHttpClient.java b/Parse/src/main/java/com/parse/ParseApacheHttpClient.java index 57f5989e9..c9e74a071 100644 --- a/Parse/src/main/java/com/parse/ParseApacheHttpClient.java +++ b/Parse/src/main/java/com/parse/ParseApacheHttpClient.java @@ -33,6 +33,7 @@ import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.entity.InputStreamEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; @@ -76,8 +77,8 @@ public ParseApacheHttpClient(int socketOperationTimeout, SSLSessionCache sslSess // Register standard protocols. SchemeRegistry schemeRegistry = new SchemeRegistry(); schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - schemeRegistry.register(new Scheme("https", SSLCertificateSocketFactory.getHttpSocketFactory( - socketOperationTimeout, sslSessionCache), 443)); + schemeRegistry.register(new Scheme("https", (SocketFactory) SSLCertificateSocketFactory.getDefault( + socketOperationTimeout, sslSessionCache), 443)); // [1] AndroidHttpClient defaults to 2 connections per route. Not fun. AND you can't set these // properties after AndroidHttpClient#newInstance(context) diff --git a/Parse/src/main/java/com/parse/ParseSQLiteCursor.java b/Parse/src/main/java/com/parse/ParseSQLiteCursor.java index a31e12072..8d45992b8 100644 --- a/Parse/src/main/java/com/parse/ParseSQLiteCursor.java +++ b/Parse/src/main/java/com/parse/ParseSQLiteCursor.java @@ -248,6 +248,12 @@ public boolean getWantsAllOnMoveCalls() { return cursor.getWantsAllOnMoveCalls(); } + @Override + public void setExtras(Bundle bundle) { + cursor.setExtras(bundle); + } + + @Override public Bundle getExtras() { return cursor.getExtras(); diff --git a/ParseStarterProject/build.gradle b/ParseStarterProject/build.gradle index 277619b43..9b28ae6ff 100644 --- a/ParseStarterProject/build.gradle +++ b/ParseStarterProject/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + + compileSdkVersion rootProject.getProperties().get('compileSdkVersion') + buildToolsVersion rootProject.getProperties().get('buildToolsVersion') defaultConfig { applicationId "com.parse.starter" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + minSdkVersion rootProject.getProperties().get('minSdkVersion') + targetSdkVersion rootProject.getProperties().get('targetSdkVersion') versionCode 1 versionName "1.0" } @@ -17,11 +18,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } } dependencies { - compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.tools.build:gradle:2.0.0-beta6' + compile 'com.android.support:appcompat-v7:24.0.0-alpha1' compile 'com.parse.bolts:bolts-tasks:1.3.0' compile project(':Parse') } diff --git a/build.gradle b/build.gradle index e1feb49c5..70318a3cf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,22 +2,25 @@ buildscript { repositories { mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:2.1.0-alpha1' } } + allprojects { repositories { mavenCentral() + jcenter() } } - ext { - compileSdkVersion = 22 - buildToolsVersion = "23.0.1" - - minSdkVersion = 9 - targetSdkVersion = 23 + setProperty('compileSdkVersion', 'android-N') + setProperty('buildToolsVersion', '24.0.0 rc1') + setProperty('minSdkVersion', 'N') + setProperty('targetSdkVersion', 'N') } + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd481edfb..77f3009ba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip \ No newline at end of file