Skip to content

Commit a92c894

Browse files
authored
Merge pull request #78 from adjust/v4182
Version 4.18.2
2 parents db3ada6 + 1f055fe commit a92c894

File tree

130 files changed

+9131
-7776
lines changed

Some content is hidden

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

130 files changed

+9131
-7776
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
### Version 4.18.2 (11th October 2019)
2+
#### Added
3+
- Added `convertUniversalLink` method from native iOS SDK to JS API (thanks to @tootsweet).
4+
5+
#### Changed
6+
- Updated example and test app to RN 0.61.2.
7+
- Updated README to fix typos (thanks to @BorisMisnik).
8+
9+
#### Native SDKs
10+
- [[email protected]][ios_sdk_v4.18.3]
11+
- [[email protected]][android_sdk_v4.18.3]
12+
13+
---
14+
115
### Version 4.18.1 (2nd July 2019)
216
#### Fixed
317
- Fixed compile errors when trying to use Adjust SDK with TypeScript 2.9 and higher (thanks to @rawrmaan).
@@ -307,6 +321,7 @@
307321
[ios_sdk_v4.17.1]: https://github.com/adjust/ios_sdk/tree/v4.17.1
308322
[ios_sdk_v4.17.2]: https://github.com/adjust/ios_sdk/tree/v4.17.2
309323
[ios_sdk_v4.18.0]: https://github.com/adjust/ios_sdk/tree/v4.18.0
324+
[ios_sdk_v4.18.3]: https://github.com/adjust/ios_sdk/tree/v4.18.3
310325

311326
[android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
312327
[android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
@@ -323,3 +338,4 @@
323338
[android_sdk_v4.15.0]: https://github.com/adjust/android_sdk/tree/v4.15.0
324339
[android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
325340
[android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
341+
[android_sdk_v4.18.3]: https://github.com/adjust/android_sdk/tree/v4.18.3

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ After that, refer to this page of the [React Native offical docs][rn-linking] fo
807807

808808
While deferred deep linking is not supported out of the box on Android and iOS, our Adjust SDK makes it possible.
809809

810-
In order to get info about the URL content in a deferred deep linking scenario, you should set a callback method on the `AdjustConfig` object which will receive one parameter where the content of the URL will be delivered. You should set this method on the config object by calling the method `setDeeplinkCallbackListener`:
810+
In order to get info about the URL content in a deferred deep linking scenario, you should set a callback method on the `AdjustConfig` object which will receive one parameter where the content of the URL will be delivered. You should set this method on the config object by calling the method `setDeferredDeeplinkCallbackListener`:
811811

812812
```js
813813
var adjustConfig = new AdjustConfig(appToken, environment);
@@ -828,7 +828,7 @@ var adjustConfig = new AdjustConfig(appToken, environment);
828828
adjustConfig.setShouldLaunchDeeplink(true);
829829
// or adjustConfig.setShouldLaunchDeeplink(false);
830830
831-
adjustConfig.setDeeplinkCallbackListener(function(deeplink) {
831+
adjustConfig.setDeferredDeeplinkCallbackListener(function(deeplink) {
832832
console.log("Deferred deep link URL content: " + deeplink);
833833
});
834834

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.18.1
1+
4.18.2

android/libs/adjust-android.jar

1.61 KB
Binary file not shown.

android/src/main/java/com/adjust/sdk/Adjust.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,11 @@ public void getSdkVersion(String sdkPrefix, Callback callback) {
469469
}
470470
}
471471

472+
@ReactMethod
473+
public void convertUniversalLink(final String url, final String scheme, final Callback callback) {
474+
callback.invoke("");
475+
}
476+
472477
@ReactMethod
473478
public void setAttributionCallbackListener() {
474479
this.attributionCallback = true;

example/.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

example/.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
root: true,
3+
extends: '@react-native-community',
4+
};

example/.flowconfig

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,71 @@
55
; Ignore "BUCK" generated dirs
66
<PROJECT_ROOT>/\.buckd/
77

8-
; Ignore unexpected extra "@providesModule"
9-
.*/node_modules/.*/node_modules/fbjs/.*
8+
; Ignore polyfills
9+
node_modules/react-native/Libraries/polyfills/.*
1010

11-
; Ignore duplicate module providers
12-
; For RN Apps installed via npm, "Libraries" folder is inside
13-
; "node_modules/react-native" but in the source repo it is in the root
14-
.*/Libraries/react-native/React.js
11+
; These should not be required directly
12+
; require from fbjs/lib instead: require('fbjs/lib/warning')
13+
node_modules/warning/.*
1514

16-
; Ignore polyfills
17-
.*/Libraries/polyfills/.*
15+
; Flow doesn't support platforms
16+
.*/Libraries/Utilities/LoadingView.js
1817

19-
; Ignore metro
20-
.*/node_modules/metro/.*
18+
[untyped]
19+
.*/node_modules/@react-native-community/cli/.*/.*
2120

2221
[include]
2322

2423
[libs]
2524
node_modules/react-native/Libraries/react-native/react-native-interface.js
2625
node_modules/react-native/flow/
27-
node_modules/react-native/flow-github/
2826

2927
[options]
3028
emoji=true
3129

32-
module.system=haste
33-
34-
munge_underscores=true
35-
36-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
30+
esproposal.optional_chaining=enable
31+
esproposal.nullish_coalescing=enable
3732

3833
module.file_ext=.js
39-
module.file_ext=.jsx
4034
module.file_ext=.json
41-
module.file_ext=.native.js
35+
module.file_ext=.ios.js
36+
37+
munge_underscores=true
38+
39+
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
40+
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
41+
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
4242

4343
suppress_type=$FlowIssue
4444
suppress_type=$FlowFixMe
4545
suppress_type=$FlowFixMeProps
4646
suppress_type=$FlowFixMeState
4747

48-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
49-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
50-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
48+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
49+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
5150
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
5251

52+
[lints]
53+
sketchy-null-number=warn
54+
sketchy-null-mixed=warn
55+
sketchy-number=warn
56+
untyped-type-import=warn
57+
nonstrict-import=warn
58+
deprecated-type=warn
59+
unsafe-getters-setters=warn
60+
inexact-spread=warn
61+
unnecessary-invariant=warn
62+
signature-verification-failure=warn
63+
deprecated-utility=error
64+
65+
[strict]
66+
deprecated-type
67+
nonstrict-import
68+
sketchy-null
69+
unclear-type
70+
unsafe-getters-setters
71+
untyped-import
72+
untyped-type-import
73+
5374
[version]
54-
^0.67.0
75+
^0.105.0

example/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
project.xcworkspace
2423

2524
# Android/IntelliJ
2625
#
@@ -40,6 +39,7 @@ yarn-error.log
4039
buck-out/
4140
\.buckd/
4241
*.keystore
42+
!debug.keystore
4343

4444
# fastlane
4545
#
@@ -54,3 +54,6 @@ buck-out/
5454

5555
# Bundle artifact
5656
*.jsbundle
57+
58+
# CocoaPods
59+
/ios/Pods/

example/.prettierrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
bracketSpacing: false,
3+
jsxBracketSameLine: true,
4+
singleQuote: true,
5+
trailingComma: 'all',
6+
};

0 commit comments

Comments
 (0)