Merging dev into master

Author: wmathurin

.circleci/config.yml

@@ -1,18 +1,18 @@
 aliases:
   # Docker image tags can be found here: https://circleci.com/developer/images/image/cimg/android
-  - &cimg cimg/android:2023.06.1-node
+  - &cimg cimg/android:2023.08.1-node
   # Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
-  - &default-api-level 30 
+  - &default-api-level 33
 
   - &gradle-cache-key
-    gradle-cache-v2-{{ checksum "build.gradle" }}-{{
+      gradle-cache-v2-{{ checksum "build.gradle.kts" }}-{{
       checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{
-      checksum "libs/SalesforceAnalytics/build.gradle" }}-{{
-      checksum "libs/SalesforceSDK/build.gradle" }}-{{
-      checksum "libs/SmartStore/build.gradle" }}-{{
-      checksum "libs/MobileSync/build.gradle" }}-{{
-      checksum "libs/SalesforceHybrid/build.gradle" }}-{{
-      checksum "libs/SalesforceReact/build.gradle" }}
+      checksum "libs/SalesforceAnalytics/build.gradle.kts" }}-{{
+      checksum "libs/SalesforceSDK/build.gradle.kts" }}-{{
+      checksum "libs/SmartStore/build.gradle.kts" }}-{{
+      checksum "libs/MobileSync/build.gradle.kts" }}-{{
+      checksum "libs/SalesforceHybrid/build.gradle.kts" }}-{{
+      checksum "libs/SalesforceReact/build.gradle.kts" }}
 
   - &restore-gradle-cache
     keys:
@@ -67,7 +67,7 @@ executors:
     docker:
       - image: *cimg
     environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
 
 jobs:
   static-analysis:
@@ -90,7 +90,7 @@ jobs:
             echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
       - run:
           name: Run Android Lint
-          command:  ./gradlew lint
+          command: ./gradlew lint
           when: always
       - run:
           name: Run Danger
@@ -114,7 +114,7 @@ jobs:
     parameters:
       lib:
         type: enum
-        enum: ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact"]
+        enum: [ "SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact" ]
         default: "SalesforceAnalytics"
       api_level:
         type: integer
@@ -146,7 +146,7 @@ jobs:
                   fi
       - run:
           name: Build for Testing
-          command:  |
+          command: |
             ./gradlew libs:SalesforceAnalytics:assembleAndroidTest
             ./gradlew libs:SalesforceSDK:assembleAndroidTest
             ./gradlew libs:SmartStore:assembleAndroidTest
@@ -156,7 +156,7 @@ jobs:
             ./gradlew native:NativeSampleApps:RestExplorer:assembleDebug
       - run:
           name: Authorize gcloud and set config defaults
-          command:  |
+          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
@@ -233,12 +233,12 @@ jobs:
       - run: *setup-env
       - run:
           name: Build for Testing
-          command:  |
+          command: |
             ./gradlew native:NativeSampleApps:RestExplorer:assembleAndroidTest
             ./gradlew native:NativeSampleApps:RestExplorer:assembleDebug
       - run:
           name: Authorize gcloud and set config defaults
-          command:  |
+          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
@@ -293,7 +293,7 @@ jobs:
       - save_cache: *save-node-cache
       - run:
           name: Build Libraries
-          command:  |
+          command: |
             ./gradlew :libs:SalesforceAnalytics:assemble
             ./gradlew :libs:SalesforceSDK:assemble
             ./gradlew :libs:SmartStore:assemble
@@ -322,7 +322,7 @@ jobs:
       - run:
           name: Build Native Sample Apps
           when: always
-          command:  |
+          command: |
             ./gradlew :native:NativeSampleApps:AppConfigurator:assemble
             ./gradlew :native:NativeSampleApps:ConfiguredApp:assemble
             ./gradlew :native:NativeSampleApps:RestExplorer:assemble
@@ -342,16 +342,12 @@ jobs:
       - run:
           name: Build Hybrid Sample Apps
           when: always
-          command:  |
+          command: |
             ./gradlew :hybrid:HybridSampleApps:AccountEditor:assemble
-            ./gradlew :hybrid:HybridSampleApps:NoteSync:assemble
             ./gradlew :hybrid:HybridSampleApps:MobileSyncExplorerHybrid:assemble
       - store_artifacts:
           path: hybrid/HybridSampleApps/AccountEditor/build/outputs/apk/
           destination: hybrid-apps
-      - store_artifacts:
-          path: hybrid/HybridSampleApps/NoteSync/build/outputs/apk/
-          destination: hybrid-apps
       - store_artifacts:
           path: hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build/outputs/apk/
           destination: hybrid-apps
@@ -363,7 +359,7 @@ parameters:
     type: integer
     default: *default-api-level
 
-workflows:  
+workflows:
   version: 2
 
   pr-tests:
@@ -381,9 +377,9 @@ workflows:
           context: Android Unit Tests
           matrix:
             parameters:
-              lib: ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact"]
-              api_level: [<< pipeline.parameters.api-level >>]
-              pr: [true]
+              lib: [ "SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact" ]
+              api_level: [ << pipeline.parameters.api-level >> ]
+              pr: [ true ]
 
   # GUI Driven "Triggers" Schedule
   # Monday    8 PM - API 24
@@ -398,20 +394,21 @@ workflows:
   # Saturday 12 AM - API 33
   nightly-tests:
     when:
-      not:  
+      not:
         equal: [ "webhook", << pipeline.trigger_source >> ]
     jobs:
       - run-tests:
           name: << matrix.lib >> API << pipeline.parameters.api-level >>
           context: Android Unit Tests
           matrix:
             parameters:
-              lib: ["SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact"]
-              api_level: [<< pipeline.parameters.api-level >>]
+              lib: [ "SalesforceAnalytics", "SalesforceSDK", "SmartStore", "MobileSync", "SalesforceHybrid", "SalesforceReact" ]
+              api_level: [ << pipeline.parameters.api-level >> ]
       - test-rest-explorer:
           name: RestExplorer API << pipeline.parameters.api-level >>
           context: Android Unit Tests
           matrix:
             parameters:
-              api_level: [<< pipeline.parameters.api-level >>]
-      - generate-artifacts
+              api_level: [ << pipeline.parameters.api-level >> ]
+      - generate-artifacts
+

.circleci/gitChangedLibs.rb

@@ -16,6 +16,7 @@
 prfiles = JSON.parse(pullfiles)
 
 libsModified = Set.new
+
 for prfile in prfiles
   path = prfile["filename"]
   for lib in libsTopoSorted

README.md

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

build.gradle

@@ -0,0 +1,30 @@
+apply(plugin = "io.github.gradle-nexus.publish-plugin")
+apply(from = "${rootDir}/publish/publish-root.gradle")
+
+buildscript {
+    repositories {
+        maven("https://plugins.gradle.org/m2/")
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
+    }
+}
+
+allprojects {
+    group = "com.salesforce.mobilesdk"
+    version = "11.1.0"
+
+    // Ensure that we do not use newer language features that would make the SDK incompatible with
+    // apps that do not target the latest version of Kotlin.
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
+        kotlinOptions {
+            apiVersion = "1.6"
+            languageVersion = "1.6"
+        }
+    }
+}

build.gradle.kts

@@ -0,0 +1,13 @@
+plugins { `kotlin-dsl` }
+
+repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+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")
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,86 @@
+plugins {
+    `android-library`
+    `maven-publish`
+    signing
+    kotlin("android")
+}
+
+if (rootProject.name == "SalesforceMobileSDK-Android") {
+    android {
+        publishing {
+            singleVariant("release") {
+                withSourcesJar()
+            }
+        }
+    }
+
+    val sourcesJar by tasks.creating(Jar::class) {
+        archiveClassifier.set("sources")
+        from(android.sourceSets.getByName("main").java.srcDirs)
+    }
+
+    artifacts {
+        archives(sourcesJar)
+    }
+
+    afterEvaluate {
+        publishing {
+            publications {
+                create<MavenPublication>("release") {
+                    artifactId = rootProject.ext["PUBLISH_ARTIFACT_ID"] as? String
+                    groupId = rootProject.ext["PUBLISH_GROUP_ID"] as? String
+                    version = rootProject.ext["PUBLISH_VERSION"] as? String
+                    from(components["release"])
+                    artifact(sourcesJar)
+                    pom {
+                        name.set(rootProject.ext["PUBLISH_ARTIFACT_ID"] as? String)
+                        description.set("Official Salesforce Android SDK")
+                        url.set("https://github.com/forcedotcom/SalesforceMobileSDK-Android")
+                        licenses {
+                            license {
+                                name.set("The Apache Software License, Version 2.0")
+                                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                            }
+                        }
+                        developers {
+                            developer {
+                                id.set("bpage")
+                                name.set("Brandon Page")
+                                email.set("bpage@salesforce.com")
+                            }
+                            developer {
+                                id.set("wmathurin")
+                                name.set("Wolfgang Mathurin")
+                                email.set("wmathurin@salesforce.com ")
+                            }
+                            developer {
+                                id.set("brianna.birman")
+                                name.set("Brianna Birman")
+                                email.set("brianna.birman@salesforce.com")
+                            }
+                            developer {
+                                id.set("JohnsonEricAtSalesforce")
+                                name.set("Eric C. Johnson")
+                                email.set("Johnson.Eric@Salesforce.com")
+                            }
+                            scm {
+                                connection.set("https://github.com/forcedotcom/SalesforceMobileSDK-Android.git")
+                                developerConnection.set("https://github.com/forcedotcom/SalesforceMobileSDK-Android.git")
+                                url.set("https://github.com/forcedotcom/SalesforceMobileSDK-Android")
+                            }
+                        }
+                    }
+                }
+            }
+
+            signing {
+                useInMemoryPgpKeys(
+                    rootProject.ext["signing.keyId"] as? String,
+                    rootProject.ext["signing.key"] as? String,
+                    rootProject.ext["signing.password"] as? String
+                )
+                sign(publishing.publications)
+            }
+        }
+    }
+}

buildSrc/settings.gradle.kts

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