Merge branch 'master' into 1061-fix-concurrent-modification-exception

Author: shlusiak

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*.{java, kt, kts, xml}]
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{java, kt, kts}]
+max_line_length = 165
+disabled_rules = no-wildcard-imports

.github/workflows/ci.yml

@@ -9,21 +9,64 @@ on:
     branches:
       - '**'
 jobs:
+  check-lint:
+    name: Lint
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch Sources
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Setup Gradle Dependencies Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+      - name: Setup Gradle Wrapper Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Spotless check
+        run: ./gradlew spotlessCheck --no-daemon
+  check-gradlewrapper:
+    name: Gradle Wrapper
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch Sources
+        uses: actions/checkout@v2
+      - name: Gradle Wrapper Validation
+        uses: gradle/wrapper-validation-action@v1
   check-build:
     name: Gradle Build
-    timeout-minutes: 5
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Fetch Sources
+        uses: actions/checkout@v2
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
           java-version: '11'
           distribution: 'adopt'
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - run: pip install --user codecov
-      - run: mkdir "$ANDROID_HOME/licenses" || true
-      - run: echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" >> "$ANDROID_HOME/licenses/android-sdk-license"
-      - run: ./gradlew clean jacocoTestReport
-      - run: codecov
+      - name: Setup Gradle Dependencies Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
+      - name: Setup Gradle Wrapper Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Run tests
+        run: ./gradlew --no-daemon clean jacocoTestReport
+      - name: Report test coverage
+        run: |
+          pip install --user codecov
+          codecov

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.0.1](https://github.com/parse-community/Parse-SDK-Android/compare/2.0.0...2.0.1) (2021-10-14)
+
+
+### Bug Fixes
+
+* add maven publications to configure the Jitpack releases ([#1128](https://github.com/parse-community/Parse-SDK-Android/issues/1128)) ([67c4fb6](https://github.com/parse-community/Parse-SDK-Android/commit/67c4fb6209e1a3b3db9663156b356b8888ef0d87))
+* Parse Android SDK 2.0.0 not building on jitpack ([#1129](https://github.com/parse-community/Parse-SDK-Android/issues/1129)) ([5d40917](https://github.com/parse-community/Parse-SDK-Android/commit/5d409174358ec4f2f04b9e0ea3000743c4a066ff))
+
 # [2.0.0](https://github.com/mtrezza/Parse-SDK-Android/compare/1.22.0...2.0.0) (2021-10-10)
 
 

CONTRIBUTING.md

@@ -14,7 +14,7 @@ We actively welcome your pull requests. When we get one, we'll run some Parse-sp
 4. Add unit tests for any new code you add.
 3. If you've changed APIs, update the documentation.
 4. Ensure the test suite passes.
-5. Make sure your code lints.
+5. Make sure your code lints by running `./gradlew spotlessApply`.
 
 ## Bugs
 Although we try to keep developing on Parse easy, you still may run into some issues. Technical questions should be asked on [Stack Overflow][stack-overflow], and for everything else we'll be using GitHub issues.

README.md

@@ -17,10 +17,10 @@ Add this in your root `build.gradle` file (**not** your module `build.gradle` fi
 
 ```gradle
 allprojects {
-	repositories {
-		...
-		maven { url "https://jitpack.io" }
-	}
+    repositories {
+        ...
+        maven { url "https://jitpack.io" }
+    }
 }
 ```
 

bolts-tasks/build.gradle

@@ -3,8 +3,8 @@
 // This source code is licensed under the MIT license found in the/
 // LICENSE file in the root directory of this source tree.
 
-apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
 
 dependencies {
     compileOnly 'com.google.android:android:4.1.1.4'
@@ -14,12 +14,12 @@ dependencies {
 javadoc.options.addStringOption('Xdoclint:none', '-quiet')
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
@@ -48,4 +48,14 @@ jacocoTestReport {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            boltsPublication(MavenPublication) {
+                from components.java
+            }
+        }
+    }
+}

bolts-tasks/src/main/java/com/parse/boltsinternal/AggregateException.java

@@ -26,33 +26,37 @@ public class AggregateException extends Exception {
     private final List<Throwable> innerThrowables;
 
     /**
-     * Constructs a new {@code AggregateException} with the current stack trace, the specified detail
-     * message and with references to the inner throwables that are the cause of this exception.
+     * Constructs a new {@code AggregateException} with the current stack trace, the specified
+     * detail message and with references to the inner throwables that are the cause of this
+     * exception.
      *
-     * @param detailMessage   The detail message for this exception.
+     * @param detailMessage The detail message for this exception.
      * @param innerThrowables The exceptions that are the cause of the current exception.
      */
     public AggregateException(String detailMessage, Throwable[] innerThrowables) {
         this(detailMessage, Arrays.asList(innerThrowables));
     }
 
-
     /**
-     * Constructs a new {@code AggregateException} with the current stack trace, the specified detail
-     * message and with references to the inner throwables that are the cause of this exception.
+     * Constructs a new {@code AggregateException} with the current stack trace, the specified
+     * detail message and with references to the inner throwables that are the cause of this
+     * exception.
      *
-     * @param detailMessage   The detail message for this exception.
+     * @param detailMessage The detail message for this exception.
      * @param innerThrowables The exceptions that are the cause of the current exception.
      */
     public AggregateException(String detailMessage, List<? extends Throwable> innerThrowables) {
-        super(detailMessage,
-                innerThrowables != null && innerThrowables.size() > 0 ? innerThrowables.get(0) : null);
+        super(
+                detailMessage,
+                innerThrowables != null && innerThrowables.size() > 0
+                        ? innerThrowables.get(0)
+                        : null);
         this.innerThrowables = Collections.unmodifiableList(innerThrowables);
     }
 
     /**
-     * Constructs a new {@code AggregateException} with the current stack trace and with references to
-     * the inner throwables that are the cause of this exception.
+     * Constructs a new {@code AggregateException} with the current stack trace and with references
+     * to the inner throwables that are the cause of this exception.
      *
      * @param innerThrowables The exceptions that are the cause of the current exception.
      */
@@ -98,9 +102,7 @@ public void printStackTrace(PrintWriter err) {
         }
     }
 
-    /**
-     * @deprecated Please use {@link #getInnerThrowables()} instead.
-     */
+    /** @deprecated Please use {@link #getInnerThrowables()} instead. */
     @Deprecated
     public List<Exception> getErrors() {
         List<Exception> errors = new ArrayList<>();
@@ -118,12 +120,9 @@ public List<Exception> getErrors() {
         return errors;
     }
 
-    /**
-     * @deprecated Please use {@link #getInnerThrowables()} instead.
-     */
+    /** @deprecated Please use {@link #getInnerThrowables()} instead. */
     @Deprecated
     public Throwable[] getCauses() {
         return innerThrowables.toArray(new Throwable[0]);
     }
-
 }