Skip to content

Commit 9117ebd

Browse files
committed
Merging dev into master
2 parents 154ec58 + 12429cc commit 9117ebd

File tree

100 files changed

+5848
-607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+5848
-607
lines changed

.codecov.yml

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,83 @@ codecov:
66
coverage:
77
precision: 2
88
round: down
9-
range: "35...85"
9+
range: "60...80"
1010

1111
status:
12+
# Overall Library Requirements
1213
project:
1314
default: false # disable the default status that measures entire project
1415
SalesforceAnalytics:
16+
threshold: 0%
1517
paths:
1618
- "libs/SalesforceAnalytics/src/"
1719
flags:
1820
- SalesforceAnalytics
1921
SalesforceSDK:
22+
threshold: 0%
2023
paths:
2124
- "libs/SalesforceSDK/src/"
2225
flags:
2326
- SalesforceSDK
2427
SalesforceHybrid:
28+
threshold: 0%
2529
paths:
2630
- "libs/SalesforceHybrid/src/"
2731
flags:
2832
- SalesforceHybrid
2933
SmartStore:
34+
threshold: 0%
3035
paths:
3136
- "libs/SmartStore/src/"
3237
flags:
3338
- SmartStore
3439
MobileSync:
40+
threshold: 0%
3541
paths:
3642
- "libs/MobileSync/src/"
3743
flags:
3844
- MobileSync
3945
SalesforceReact:
46+
threshold: 0%
47+
paths:
48+
- "libs/SalesforceReact/src/"
49+
flags:
50+
- SalesforceReact
51+
52+
# Pull Request Requirements
53+
patch:
54+
SalesforceAnalytics:
55+
target: 80%
56+
paths:
57+
- "libs/SalesforceAnalytics/src/"
58+
flags:
59+
- SalesforceAnalytics
60+
SalesforceSDK:
61+
target: 80%
62+
paths:
63+
- "libs/SalesforceSDK/src/"
64+
flags:
65+
- SalesforceSDK
66+
SalesforceHybrid:
67+
target: 80%
68+
paths:
69+
- "libs/SalesforceHybrid/src/"
70+
flags:
71+
- SalesforceHybrid
72+
SmartStore:
73+
target: 80%
74+
paths:
75+
- "libs/SmartStore/src/"
76+
flags:
77+
- SmartStore
78+
MobileSync:
79+
target: 80%
80+
paths:
81+
- "libs/MobileSync/src/"
82+
flags:
83+
- MobileSync
84+
SalesforceReact:
85+
target: 80%
4086
paths:
4187
- "libs/SalesforceReact/src/"
4288
flags:

.github/DangerFiles/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ GEM
7373
terminal-table (3.0.2)
7474
unicode-display_width (>= 1.1.1, < 3)
7575
unicode-display_width (2.6.0)
76-
uri (1.0.2)
76+
uri (1.0.3)
7777

7878
PLATFORMS
7979
arm64-darwin-23

.github/workflows/reusable-workflow.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: android-actions/setup-android@v3
4747
- uses: gradle/actions/setup-gradle@v4
4848
with:
49-
gradle-version: "8.7"
49+
gradle-version: "8.10.1"
5050
add-job-summary: on-failure
5151
add-job-summary-as-pr-comment: on-failure
5252
- name: Run Lint
@@ -79,8 +79,8 @@ jobs:
7979
if: success() || failure()
8080
env:
8181
# Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
82-
PR_API_VERSION: "34"
83-
FULL_API_RANGE: "28 29 30 31 32 33 34 35"
82+
PR_API_VERSION: "35"
83+
FULL_API_RANGE: "28 29 30 31 32 33 34 35 36"
8484
IS_PR: ${{ inputs.is_pr }}
8585
run: |
8686
LEVELS_TO_TEST=$FULL_API_RANGE
@@ -114,8 +114,8 @@ jobs:
114114
if: success() || failure()
115115
env:
116116
# Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
117-
PR_API_VERSION: "34"
118-
FULL_API_RANGE: "28 29 30 31 32 33 34 35"
117+
PR_API_VERSION: "35"
118+
FULL_API_RANGE: "28 29 30 31 32 33 34 35 36"
119119
IS_PR: ${{ inputs.is_pr }}
120120
run: |
121121
LEVELS_TO_TEST=$FULL_API_RANGE
@@ -148,10 +148,8 @@ jobs:
148148
check_retries: true
149149
flaky_summary: true
150150
fail_on_failure: true
151-
detailed_summary: true
152151
group_reports: false
153152
include_passed: true
154-
skip_success_summary: true
155153
include_empty_in_summary: false
156154
simplified_summary: true
157155
report_paths: 'firebase_results/**.xml'

CONTRIBUTING.md

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# Contributing Guide For Salesforce Mobile SDK
2+
3+
This page lists the operational governance model of this project, as well as the recommendations and requirements for how to best contribute to Salesforce Mobile SDK. We strive to obey these as best as possible. As always, thanks for contributing – we hope these guidelines make it easier and shed some light on our approach and processes.
4+
5+
# Governance Model
6+
7+
## Salesforce Sponsored
8+
9+
The intent and goal of open sourcing this project is to increase the contributor and user base. However, only Salesforce employees will be given `admin` rights and will be the final arbitrars of what contributions are accepted or not.
10+
11+
# Issues, requests & ideas
12+
13+
Use GitHub Issues page to submit issues, enhancement requests and discuss ideas.
14+
15+
### Bug Reports and Fixes
16+
- If you find a bug, please search for it in the [Issues](https://github.com/forcedotcom/SalesforceMobileSDK-Android/issues), and if it isn't already tracked,
17+
[create a new issue](https://github.com/forcedotcom/SalesforceMobileSDK-Android/issues/new). Fill out the "Bug Report" section of the issue template. Even if an Issue is closed, feel free to comment and add details, it will still
18+
be reviewed.
19+
- Issues that have already been identified as a bug (note: able to reproduce) will be labelled `bug`.
20+
- If you'd like to submit a fix for a bug, [send a Pull Request](#creating_a_pull_request) and mention the Issue number.
21+
- Include tests that isolate the bug and verifies that it was fixed.
22+
23+
### New Features
24+
- If you'd like to add new functionality to this project, describe the problem you want to solve in a [new Issue](https://github.com/forcedotcom/SalesforceMobileSDK-Android/issues/new).
25+
- Issues that have been identified as a feature request will be labelled `enhancement`.
26+
- If you'd like to implement the new feature, please wait for feedback from the project
27+
maintainers before spending too much time writing the code. In some cases, `enhancement`s may
28+
not align well with the project objectives at the time.
29+
30+
### Tests, Documentation, Miscellaneous
31+
- If you'd like to improve the tests, you want to make the documentation clearer, you have an
32+
alternative implementation of something that may have advantages over the way its currently
33+
done, or you have any other change, we would be happy to hear about it!
34+
- If its a trivial change, go ahead and [send a Pull Request](#creating_a_pull_request) with the changes you have in mind.
35+
- If not, [open an Issue](https://github.com/forcedotcom/SalesforceMobileSDK-Android/issues/new) to discuss the idea first.
36+
37+
# Contribution Checklist
38+
39+
- [x] Clean, simple, well styled code
40+
- [x] Commits should be atomic and messages must be descriptive. Related issues should be mentioned by Issue number.
41+
- [x] Comments
42+
- Module-level & function-level comments.
43+
- Comments on complex blocks of code or algorithms (include references to sources).
44+
- [x] Tests
45+
- The test suite, if provided, must be complete and pass
46+
- Increase code coverage, not versa.
47+
- [x] Dependencies
48+
- Minimize number of dependencies.
49+
- Prefer Apache 2.0, BSD3, MIT, ISC and MPL licenses.
50+
- [x] Reviews
51+
- Changes must be approved via peer code review
52+
53+
# Creating a Pull Request
54+
55+
1. **Ensure the bug/feature was not already reported** by searching on GitHub under Issues. If none exists, create a new issue so that other contributors can keep track of what you are trying to add/fix and offer suggestions (or let you know if there is already an effort in progress).
56+
3. **Clone** the forked repo to your machine.
57+
4. **Create** a new branch to contain your work (e.g. `git br fix-issue-11`)
58+
4. **Commit** changes to your own branch.
59+
5. **Push** your work back up to your fork. (e.g. `git push fix-issue-11`)
60+
6. **Submit** a Pull Request against the `dev` branch and refer to the issue(s) you are fixing. Try not to pollute your pull request with unintended changes. Keep it simple and small.
61+
7. **Sign** the Salesforce CLA (you will be prompted to do so when submitting the Pull Request)
62+
63+
> **NOTE**: Be sure to [sync your fork](https://help.github.com/articles/syncing-a-fork/) before making a pull request.
64+
65+
# Contributor License Agreement ("CLA")
66+
In order to accept your pull request, we need you to submit a CLA. You only need
67+
to do this once to work on any of Salesforce's open source projects.
68+
69+
Complete your CLA here: <https://cla.salesforce.com/sign-cla>
70+
71+
# Issues
72+
We use GitHub issues to track public bugs. Please ensure your description is
73+
clear and has sufficient instructions to be able to reproduce the issue.
74+
75+
# Code of Conduct
76+
Please follow our [Code of Conduct](CODE_OF_CONDUCT.md).
77+
78+
# License
79+
By contributing your code, you agree to license your contribution under the terms of our project [LICENSE](LICENSE.txt) and to sign the [Salesforce CLA](https://cla.salesforce.com/sign-cla)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This pulls submodule dependencies from github.
2323
Introduction
2424
==
2525

26-
### What's New in 13.0.2
26+
### What's New in 13.1.0
2727
See [release notes](https://github.com/forcedotcom/SalesforceMobileSDK-Android/releases).
2828

2929
### Native Applications

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath("com.android.tools.build:gradle:8.6.1")
13-
classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
12+
classpath("com.android.tools.build:gradle:8.10.1")
13+
classpath("io.github.gradle-nexus:publish-plugin:2.0.0")
1414
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
15-
classpath("org.jacoco:org.jacoco.core:0.8.12")
15+
classpath("org.jacoco:org.jacoco.core:0.8.13")
1616
}
1717
}
1818

1919
allprojects {
2020
group = "com.salesforce.mobilesdk"
21-
version = "13.0.2"
21+
version = "13.1.0"
2222

2323
// Ensure that we do not use newer language features that would make the SDK incompatible with
2424
// apps that do not target the latest version of Kotlin.

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77
}
88

99
dependencies {
10-
implementation("com.android.tools.build:gradle:8.6.1")
10+
implementation("com.android.tools.build:gradle:8.10.1")
1111
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
1212
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
1313
}

external/cordova/cordova.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
under the License.
2020
*/
2121
;(function() {
22-
var PLATFORM_VERSION_BUILD_LABEL = '13.0.0';
22+
var PLATFORM_VERSION_BUILD_LABEL = '14.0.1';
2323
// file: src/scripts/require.js
2424
var require;
2525
var define;
@@ -1531,14 +1531,14 @@ module.exports = {
15311531
},
15321532

15331533
/**
1534-
* Load the url into the webview or into new browser instance.
1534+
* Load the url into the WebView or into new browser instance.
15351535
*
15361536
* @param url The URL to load
15371537
* @param props Properties that can be passed in to the activity:
15381538
* wait: int => wait msec before loading URL
15391539
* loadingDialog: "Title,Message" => display a native loading dialog
15401540
* loadUrlTimeoutValue: int => time in msec to wait before triggering a timeout error
1541-
* clearHistory: boolean => clear webview history (default=false)
1541+
* clearHistory: boolean => clear WebView history (default=false)
15421542
* openExternal: boolean => open in a new browser (default=false)
15431543
*
15441544
* Example:

external/shared

Submodule shared updated 35 files

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)