Merge branch 'master' into feat/contains-all-starting-with

Author: Jawnnypoo

.gitignore

@@ -34,6 +34,7 @@ build
 testData
 testCache
 server.config
+docs/
 
 # Jacoco
 jacoco.exec

.travis.yml

@@ -4,40 +4,40 @@ branches:
     - /^\d+\.\d+\.\d+$/ # regex
 
 language: android
-sudo: false
 
 jdk:
   - oraclejdk8
 
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-27.0.0
-    - android-27
-    - doc-27
-
 before_install:
     - pip install --user codecov
-    - yes | sdkmanager "platforms;android-27"
-
-script:
-  - ./gradlew clean testDebugUnitTest jacocoTestReport
+    - mkdir "$ANDROID_HOME/licenses" || true
+    - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
 
 after_success:
   - ./gradlew coveralls
   - codecov
-  - ./scripts/publish_snapshot.sh
 
 cache:
   directories:
     - $HOME/.gradle
     - $HOME/.m2/repository
 
-deploy:
-  provider: script
-  script: ./gradlew bintrayUpload
-  skip_cleanup: true
-  on:
-    branch: master
-    tags: true
+jobs:
+  include:
+    - stage: test
+      script: ./gradlew clean testDebugUnitTest jacocoTestReport
+    - stage: release
+      script: ./gradlew javadocRelease
+      deploy:
+        - provider: pages
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
+          local_dir: docs/
+          on:
+            all_branches: true
+        - provider: script
+          script: ./gradlew bintrayUpload
+          skip_cleanup: true
+          on:
+            branch: master
+            tags: true

Parse/build.gradle

@@ -1,31 +1,18 @@
-import com.android.builder.core.BuilderConstants
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.kt3k.coveralls'
-apply plugin: 'com.jfrog.bintray'
 
 group = 'com.parse'
-version = '1.16.6'
+version = rootProject.ext.commonLibVersion
 
 ext {
     projDescription = 'A library that gives you access to the powerful Parse cloud platform from your Android app.'
     artifact = 'parse-android'
     projName = 'Parse-Android'
     gitLink = 'https://github.com/parse-community/Parse-SDK-Android'
 }
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
-    }
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -51,11 +38,12 @@ android {
 }
 
 ext {
-    okhttpVersion = '3.9.0'
+    okhttpVersion = '3.10.0'
 }
 
 dependencies {
     api "com.android.support:support-annotations:$supportLibVersion"
+    api "com.android.support:support-compat:$supportLibVersion"
     api 'com.parse.bolts:bolts-tasks:1.4.0'
     api "com.squareup.okhttp3:okhttp:$okhttpVersion"
 
@@ -65,109 +53,6 @@ dependencies {
     testImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
 }
 
-android.libraryVariants.all { variant ->
-    def name = variant.buildType.name
-
-    def javadoc = task("javadoc${variant.name.capitalize()}", type: Javadoc) {
-        description "Generates Javadoc for $variant.name."
-        source = variant.javaCompile.source
-        ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
-
-        options.docletpath = [rootProject.file("./gradle/ExcludeDoclet.jar")]
-        options.doclet = "me.grantland.doclet.ExcludeDoclet"
-
-        options.linksOffline("http://d.android.com/reference", "${android.sdkDirectory}/docs/reference")
-        options.links("http://boltsframework.github.io/docs/android/")
-
-        exclude '**/BuildConfig.java'
-        exclude '**/R.java'
-        exclude '**/internal/**'
-    }
-
-    def javadocJar = task("javadocJar${variant.name.capitalize()}", type: Jar, dependsOn: "javadoc${variant.name.capitalize()}") {
-        classifier = 'javadoc'
-        from javadoc.destinationDir
-    }
-
-    if (name.equals(BuilderConstants.RELEASE)) {
-        artifacts.add('archives', javadocJar);
-    }
-}
-
-//region Maven
-
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-def isSnapshot = version.endsWith('-SNAPSHOT')
-def ossrhUsername = hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : System.getenv('CI_NEXUS_USERNAME')
-def ossrhPassword = hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : System.getenv('CI_NEXUS_PASSWORD')
-
-def pomConfig = {
-    licenses {
-        license {
-            name 'BSD License'
-            url 'https://github.com/parse-community/Parse-SDK-Android/blob/master/LICENSE'
-            distribution 'repo'
-        }
-    }
-
-    scm {
-       connection 'scm:git@github.com:parse-community/Parse-SDK-Android.git'
-       developerConnection 'scm:git@github.com:parse-community/Parse-SDK-Android.git'
-       url gitLink
-    }
-
-    developers {
-        developer {
-            id 'parse'
-            name 'Parse'
-        }
-    }
-}
-
-
-uploadArchives {
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-            authentication(userName: ossrhUsername, password: ossrhPassword)
-        }
-
-        snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-            authentication(userName: ossrhUsername, password: ossrhPassword)
-        }
-
-        def basePom = {
-            name projName
-            artifactId = artifact
-            packaging 'aar'
-            description projDescription
-            url gitLink
-        }
-
-        pom.project basePom << pomConfig
-    }
-}
-
-signing {
-    required { !isSnapshot && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
-}
-
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-artifacts {
-    archives androidSourcesJar
-}
-
-//endregion
-
 //region Code Coverage
 
 apply plugin: 'jacoco'
@@ -210,88 +95,4 @@ coveralls.jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/jacoco
 
 //endregion
 
-// Requires apply plugin: 'com.jfrog.bintray'
-
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_API_KEY')
-
-    publications = ["MyPublication"]
-
-    publish = true
-    pkg {
-        repo = 'maven'
-        name = 'com.parse:parse-android'
-        userOrg = 'parse'
-        licenses = ['BSD License']
-        vcsUrl = 'https://github.com/parse-community/Parse-SDK-Android'
-        version {
-            name = project.version
-            desc = projDescription
-            released = new Date()
-            vcsTag = project.version
-
-            // Sonatype username/passwrod must be set for this operation to happen
-            mavenCentralSync {
-              sync = true
-              user = ossrhUsername
-              password = ossrhPassword
-              close = '1' // release automatically
-           }
-        }
-    }
-}
-
-// Create the publication with the pom configuration:
-apply plugin: 'maven-publish'
-publishing {
-    publications {
-        MyPublication(MavenPublication) {
-            groupId group
-            // We have to specify it here because otherwise Bintray's plugin will assume the artifact's name is Parse
-            artifactId artifact
-            artifacts = [androidSourcesJar, bundleRelease]
-            version version
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('description', projDescription)
-                root.appendNode('name', projName)
-                root.appendNode('url', gitLink)
-                root.children().last() + pomConfig
-
-                // maven-publish workaround to include dependencies
-                def dependenciesNode = asNode().appendNode('dependencies')
-
-                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
-                configurations.implementation.allDependencies.each {
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.group)
-                    dependencyNode.appendNode('artifactId', it.name)
-                    dependencyNode.appendNode('version', it.version)
-                }
-
-            }
-        }
-    }
-}
-
-// End of Bintray plugin
-
-apply plugin: "com.jfrog.artifactory"
-
-artifactory {
-    contextUrl = 'https://oss.jfrog.org'
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local' // The Artifactory repository key to publish to
-
-            username = System.getenv('BINTRAY_USER')
-            password = System.getenv('BINTRAY_API_KEY')
-            maven = true
-        }
-        defaults {
-            publishArtifacts = true
-            publications('MyPublication')
-        }
-    }
-}
+apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

Parse/src/main/AndroidManifest.xml

@@ -13,11 +13,6 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-    <application>
-        <service
-            android:name=".PushServiceApi26"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true"/>
-    </application>
+    <application/>
 
 </manifest>

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

@@ -17,7 +17,7 @@
  * {@code AbstractParseQueryController} is an abstract implementation of
  * {@link ParseQueryController}, which implements {@link ParseQueryController#getFirstAsync}.
  */
-/** package */ abstract class AbstractQueryController implements ParseQueryController {
+abstract class AbstractQueryController implements ParseQueryController {
 
   @Override
   public <T extends ParseObject> Task<T> getFirstAsync(ParseQuery.State<T> state, ParseUser user,