Merging dev into master

Author: wmathurin

.circleci/Dangerfile_Lib.rb

@@ -10,8 +10,9 @@
   warn("Test results not available from Firebase.")
 end
 
-if File.file?("libs/#{ENV['CURRENT_LIB']}/build/reports/lint-results.xml")
-  android_lint.report_file = "libs/#{ENV['CURRENT_LIB']}/build/reports/lint-results.xml"
+if File.file?("libs/#{ENV['CURRENT_LIB']}/build/reports/lint-results-debug.xml")
+  android_lint.skip_gradle_task = true
+  android_lint.report_file = "libs/#{ENV['CURRENT_LIB']}/build/reports/lint-results-debug.xml"
   android_lint.filtering = true
   android_lint.lint(inline_mode: true)
 else

.circleci/config.yml

@@ -1,6 +1,6 @@
 aliases:
   # Docker image tags can be found here: https://circleci.com/developer/images/image/cimg/android
-  - &cimg cimg/android:2023.08.1-node
+  - &cimg cimg/android:2023.11.1-node
   # Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
   - &default-api-level 33
 
@@ -70,44 +70,15 @@ executors:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
 
 jobs:
-  static-analysis:
-    executor: linux
+  pr-danger:
+    docker:
+      - image: cimg/ruby:3.2.2
     steps:
       - checkout
-      - restore_cache: *restore-gradle-cache
-      - restore_cache: *restore-node-cache
-      - restore_cache: *restore-ruby-cache
       - run:
-          name: Setup Environment
           command: |
-            ./install.sh
-            sudo chmod -R a+w /var/lib/gems/ && sudo chmod -R a+w /usr/local/bin
-            gem install bundler
             gem install danger
-            gem install danger-junit
-            gem install danger-android_lint
-            gem install danger-jacoco
-            echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
-      - run:
-          name: Run Android Lint
-          command: ./gradlew lint
-          when: always
-      - run:
-          name: Run Danger
-          command: |
-            if [[ $CIRCLE_BRANCH == *"pull"* ]]; then
-                # These env vars are not set properly on rebuilds
-                export CIRCLE_PULL_REQUEST="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
-                export CIRCLE_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
-                export CI_PULL_REQUEST="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
-                export CI_PULL_REQUESTS="https://github.com/forcedotcom/SalesforceMobileSDK-Android/${CIRCLE_BRANCH}"
-                danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
-            else
-                echo "No need to run Danger."
-            fi
-      - save_cache: *save-gradle-cache
-      - save_cache: *save-node-cache
-      - save_cache: *save-ruby-cache
+            danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
 
   run-tests:
     executor: linux
@@ -124,10 +95,6 @@ jobs:
         default: false
     steps:
       - checkout
-      - restore_cache: *restore-gradle-cache
-      - restore_cache: *restore-node-cache
-      - restore_cache: *restore-ruby-cache
-      - run: *setup-env
       - when:
           condition: << parameters.pr >>
           steps:
@@ -144,22 +111,26 @@ jobs:
                       echo -e "\n\nNo need to test << parameters.lib >> for this PR, stopping execution."
                       circleci step halt
                   fi
+      - restore_cache: *restore-gradle-cache
+      - restore_cache: *restore-node-cache
+      - restore_cache: *restore-ruby-cache
+      - run: *setup-env
+      - run:
+          name: Static Analysis
+          command: ./gradlew libs:<< parameters.lib >>:lint
       - run:
           name: Build for Testing
           command: |
-            ./gradlew libs:SalesforceAnalytics:assembleAndroidTest
-            ./gradlew libs:SalesforceSDK:assembleAndroidTest
-            ./gradlew libs:SmartStore:assembleAndroidTest
-            ./gradlew libs:MobileSync:assembleAndroidTest
-            ./gradlew libs:SalesforceHybrid:assembleAndroidTest
-            ./gradlew libs:SalesforceReact:assembleAndroidTest
+            ./gradlew libs:<< parameters.lib >>:assembleAndroidTest
             ./gradlew native:NativeSampleApps:RestExplorer:assembleDebug
+          when: always
       - run:
           name: Authorize gcloud and set config defaults
           command: |
             echo $GCLOUD_SERVICE_KEY | base64 --decode --ignore-garbage > ${HOME}/gcloud-service-key.json
             gcloud auth activate-service-account --key-file=${HOME}/gcloud-service-key.json
             gcloud --quiet config set project mobile-apps-firebase-test
+          when: always
       - run:
           name: Run << parameters.lib >> Tests with API << parameters.api_level >>
           command: |
@@ -180,8 +151,9 @@ jobs:
                 --directories-to-pull=/sdcard  \
                 --results-dir=<< parameters.lib >>-${CIRCLE_BUILD_NUM}  \
                 --results-history-name=<< parameters.lib >>  \
-                --timeout=20m --no-auto-google-login --no-record-video --no-performance-metrics
+                --timeout=20m --no-auto-google-login --no-record-video --no-performance-metrics --num-flaky-test-attempts=1
           no_output_timeout: 20m
+          when: always
       - run:
           name: Copy test results data
           command: |
@@ -214,8 +186,12 @@ jobs:
                   danger --dangerfile=.circleci/Dangerfile_Lib.rb --danger_id=<< parameters.lib >> --verbose
                 background: true
                 when: always
+                environment:
+                  CURRENT_LIB: << parameters.lib >>
       - store_artifacts:
           path: firebase/
+      - store_artifacts:
+          path: libs/<< parameters.lib >>/build/reports/
       - store_test_results:
           path: firebase/results
 
@@ -326,7 +302,6 @@ jobs:
             ./gradlew :native:NativeSampleApps:AppConfigurator:assemble
             ./gradlew :native:NativeSampleApps:ConfiguredApp:assemble
             ./gradlew :native:NativeSampleApps:RestExplorer:assemble
-            ./gradlew :native:NativeSampleApps:MobileSyncExplorer:assemble
       - store_artifacts:
           path: native/NativeSampleApps/AppConfigurator/build/outputs/apk/
           destination: native-apps
@@ -336,9 +311,6 @@ jobs:
       - store_artifacts:
           path: native/NativeSampleApps/RestExplorer/build/outputs/apk/
           destination: native-apps
-      - store_artifacts:
-          path: native/NativeSampleApps/MobileSyncExplorer/build/outputs/apk/
-          destination: native-apps
       - run:
           name: Build Hybrid Sample Apps
           when: always
@@ -370,7 +342,7 @@ workflows:
             pattern: "^pull/\\d+$"
             value: << pipeline.git.branch >>
     jobs:
-      - static-analysis:
+      - pr-danger:
           context: Android Unit Tests
       - run-tests:
           name: << matrix.lib >>
@@ -382,16 +354,15 @@ workflows:
               pr: [ true ]
 
   # GUI Driven "Triggers" Schedule
-  # Monday    8 PM - API 24
-  # Monday    9 PM - API 26
-  # Monday   10 PM - API 27
-  # Monday   11 PM - API 30
-  # Tuesday  12 AM - API 32
-  # Friday    8 PM - API 25
-  # Friday    9 PM - API 27
-  # Friday   10 PM - API 29
-  # Friday   11 PM - API 31
-  # Saturday 12 AM - API 33
+  # Monday    8 PM - API 26
+  # Monday    9 PM - API 28
+  # Monday   10 PM - API 30
+  # Monday   11 PM - API 32
+  # Tuesday  12 AM - API 34
+  # Friday    8 PM - API 27
+  # Friday    9 PM - API 29
+  # Friday   10 PM - API 31
+  # Friday   11 PM - API 33
   nightly-tests:
     when:
       not:

README.md

@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
 Introduction
 ==
 
-### What's New in 11.1.0
+### What's New in 12.0.0
 See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
 
 ### Native Applications

build.gradle.kts

@@ -9,9 +9,9 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.2.0")
         classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
     }
 }
 

buildSrc/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:7.4.2")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
+    implementation("com.android.tools.build:gradle:8.2.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.21")
 }

buildSrc/src/main/kotlin/publish-module.gradle.kts

@@ -15,7 +15,6 @@ if (rootProject.name == "SalesforceMobileSDK-Android") {
     }
 
     val sourcesJar by tasks.creating(Jar::class) {
-        archiveClassifier.set("sources")
         from(android.sourceSets.getByName("main").java.srcDirs)
     }
 

external/shared

@@ -1,7 +1,6 @@
-cdvCompileSdkVersion=33
-cdvMinSdkVersion=24
+cdvCompileSdkVersion=34
+cdvMinSdkVersion=26
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
 org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"

gradle.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +213,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradle/wrapper/gradle-wrapper.properties

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal