Merging dev into master

.circleci/config.yml

@@ -389,7 +389,6 @@ workflows:
   # Friday 8 PM  - API 29
   # Friday 9 PM  - API 27
   # Friday 10 PM - API 25
-  # Friday 11 PM - API 23
   test-api-30:
     triggers:
       - schedule:
@@ -739,46 +738,3 @@ workflows:
           test_apk: *salesforceReact-apk-path
           api_level: 25
 
-  test-api-23:
-    triggers:
-      - schedule:
-          cron: "0 7 * * 6"
-          filters:
-            branches:
-              only:
-                - dev
-    jobs:
-      - run-tests:
-          name: "SalesforceAnalytics API 23"
-          api_level: 23
-      - run-tests:
-          name: "SalesforceSDK API 23"
-          lib: "SalesforceSDK"
-          test_apk: *coresdk-apk-path
-          api_level: 23
-      - run-tests:
-          name: "SmartStore API 23"
-          lib: "SmartStore"
-          test_apk: *smartStore-apk-path
-          api_level: 23
-      - run-tests:
-          name: "MobileSync API 23"
-          lib: "MobileSync"
-          test_apk: *mobileSync-apk-path
-          api_level: 23
-      - run-tests:
-          name: "SalesforceHybrid API 23"
-          lib: "SalesforceHybrid"
-          test_apk: *salesforceHybrid-apk-path
-          api_level: 23
-      - run-tests:
-          name: "RestExplorer API 23"
-          lib: "RestExplorer"
-          test_apk: *restExplorer-apk-path
-          api_level: 23
-      - run-tests:
-          name: "SalesforceReact API 23"
-          lib: "SalesforceReact"
-          test_apk: *salesforceReact-apk-path
-          api_level: 23
-

CODEOWNERS

@@ -0,0 +1,2 @@
+# Comment line immediately above ownership line is reserved for related gus information. Please be careful while editing.
+#ECCN:Open Source

README.md

@@ -23,8 +23,8 @@ This pulls submodule dependencies from github.
 Introduction
 ==
 
-### What's New in 9.2.1
-See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v9.2.1).
+### What's New in 10.0.0
+See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases/tag/v10.0.0).
 
 ### Native Applications
 The Salesforce Mobile SDK provides essential libraries for quickly building native mobile apps that seamlessly integrate with the Salesforce cloud architecture.  Out of the box, we provide an implementation of OAuth2, abstracting away the complexity of securely storing refresh tokens or fetching a new session ID when a session expires. The SDK also provides Java wrappers for the Salesforce REST API, making it easy to retrieve, store, and manipulate data.

build.gradle

@@ -10,14 +10,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.0.2'
+    classpath 'com.android.tools.build:gradle:7.1.0'
     classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
   }
 }
 
 allprojects {
   group = 'com.salesforce.mobilesdk'
-  version = '9.2.1'
+  version = '10.0.0'
   repositories {
     mavenLocal()
     maven {

gradle.properties

@@ -1,3 +1,3 @@
-cdvCompileSdkVersion=30
-cdvMinSdkVersion=23
+cdvCompileSdkVersion=32
+cdvMinSdkVersion=24
 android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hybrid/HybridSampleApps/AccountEditor/build.gradle

@@ -5,11 +5,11 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
-    targetSdkVersion 30
-    minSdkVersion 23
+    targetSdkVersion 32
+    minSdkVersion 24
   }
 
   sourceSets {
@@ -23,15 +23,14 @@ android {
       assets.srcDirs = ['assets']
     }
   }
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/NOTICE'
-  }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE']
+        }
+    }
+    lint {
+        abortOnError false
+        xmlReport true
+    }
 
-  lintOptions {
-    xmlReport true
-    abortOnError false
-  }
 }

hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle

@@ -5,11 +5,11 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
-    targetSdkVersion 30
-    minSdkVersion 23
+    targetSdkVersion 32
+    minSdkVersion 24
   }
 
   sourceSets {
@@ -24,15 +24,14 @@ android {
       assets.srcDirs = ['assets']
     }
   }
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/NOTICE'
-  }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE']
+        }
+    }
+    lint {
+        abortOnError false
+        xmlReport true
+    }
 
-  lintOptions {
-    xmlReport true
-    abortOnError false
-  }
 }

hybrid/HybridSampleApps/NoteSync/build.gradle

@@ -5,11 +5,11 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 32
 
   defaultConfig {
-    targetSdkVersion 30
-    minSdkVersion 23
+    targetSdkVersion 32
+    minSdkVersion 24
   }
 
   sourceSets {
@@ -23,15 +23,14 @@ android {
       assets.srcDirs = ['assets']
     }
   }
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/NOTICE'
-  }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE']
+        }
+    }
+    lint {
+        abortOnError false
+        xmlReport true
+    }
 
-  lintOptions {
-    xmlReport true
-    abortOnError false
-  }
 }

libs/MobileSync/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.salesforce.androidsdk.mobilesync"
-    android:versionCode="75"
-    android:versionName="9.2.1">
+    android:versionCode="76"
+    android:versionName="10.0.0.dev">
 
     <application />
 

libs/MobileSync/build.gradle

@@ -20,11 +20,11 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
-        targetSdkVersion 30
-        minSdkVersion 23
+        targetSdkVersion 32
+        minSdkVersion 24
     }
 
   buildTypes {
@@ -51,26 +51,25 @@ android {
       res.srcDirs = ['../test/MobileSyncTest/res']
     }
   }
-  defaultConfig {
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE']
+        }
+    }
+    defaultConfig {
     testApplicationId "com.salesforce.androidsdk.mobilesync.tests"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/NOTICE'
-  }
+    lint {
+        abortOnError false
+        xmlReport true
+    }
 
-  lintOptions {
-    xmlReport true 
-    abortOnError false
-  }
 }
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '9.2.1'
+    PUBLISH_VERSION = '10.0.0'
     PUBLISH_ARTIFACT_ID = 'MobileSync'
 }
 

libs/MobileSync/src/com/salesforce/androidsdk/mobilesync/app/MobileSyncUpgradeManager.java

@@ -26,8 +26,6 @@
  */
 package com.salesforce.androidsdk.mobilesync.app;
 
-import com.salesforce.androidsdk.mobilesync.manager.LayoutSyncManager;
-import com.salesforce.androidsdk.mobilesync.manager.MetadataSyncManager;
 import com.salesforce.androidsdk.mobilesync.util.MobileSyncLogger;
 import com.salesforce.androidsdk.smartstore.app.SmartStoreUpgradeManager;
 
@@ -80,9 +78,6 @@ protected synchronized void upgradeSObject() {
         try {
             final String majorVersionNum = installedVersion.substring(0, 3);
             double installedVerDouble = Double.parseDouble(majorVersionNum);
-            if (installedVerDouble < 8.2) {
-                upgradeTo8Dot2();
-            }
         } catch (Exception e) {
             MobileSyncLogger.e(TAG, "Failed to parse installed version.");
         }
@@ -96,11 +91,4 @@ protected synchronized void upgradeSObject() {
     public String getInstalledSobjectVersion() {
         return getInstalledVersion(MOBILE_SYNC_KEY);
     }
-
-    private void upgradeTo8Dot2() {
-        LayoutSyncManager.getInstance().getSmartStore().dropSoup("sfdcLayouts");
-        LayoutSyncManager.reset();
-        MetadataSyncManager.getInstance().getSmartStore().dropSoup("sfdcMetadata");
-        MetadataSyncManager.reset();
-    }
 }

libs/SalesforceAnalytics/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.salesforce.androidsdk.analytics" 
-	android:versionCode="75"
-	android:versionName="9.2.1">
+	android:versionCode="76"
+	android:versionName="10.0.0.dev">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

libs/SalesforceAnalytics/build.gradle

@@ -9,18 +9,18 @@ apply plugin: 'com.android.library'
 
 dependencies {
     api 'com.squareup:tape:1.2.3'
-    api 'io.github.pilgr:paperdb:2.7.1'
+    api 'io.github.pilgr:paperdb:2.7.2'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
-        targetSdkVersion 30
-        minSdkVersion 23
+        targetSdkVersion 32
+        minSdkVersion 24
     }
 
   buildTypes {
@@ -46,29 +46,28 @@ android {
       res.srcDirs = ['../test/SalesforceAnalyticsTest/res']
     }
   }
-  defaultConfig {
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE']
+        }
+    }
+    defaultConfig {
     testApplicationId "com.salesforce.androidsdk.analytics.tests"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
-  packagingOptions {
-    exclude 'META-INF/LICENSE'
-    exclude 'META-INF/LICENSE.txt'
-    exclude 'META-INF/DEPENDENCIES'
-    exclude 'META-INF/NOTICE'
-  }
+    lint {
+        abortOnError false
+        xmlReport true
+    }
 
-  lintOptions {
-    xmlReport true
-    abortOnError false
-  }
 }
 
 ext {
     PUBLISH_GROUP_ID = 'com.salesforce.mobilesdk'
-    PUBLISH_VERSION = '9.2.1'
+    PUBLISH_VERSION = '10.0.0'
     PUBLISH_ARTIFACT_ID = 'SalesforceAnalytics'
 }
 
 if (rootProject.name == 'SalesforceMobileSDK-Android') {
     apply from: "${rootProject.projectDir}/publish/publish-module.gradle"
-}
+}