Skip to content
This repository was archived by the owner on Jun 27, 2023. It is now read-only.

Commit 4c6e977

Browse files
authored
fix: setting minSDK to > 21 for Android and updating to sovran 0.2.2 (segmentio#430)
Co-authored-by: Oscar Bazaldua <[email protected]>
1 parent a0ca6c5 commit 4c6e977

File tree

5 files changed

+37
-14
lines changed

5 files changed

+37
-14
lines changed

example/android/build.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,23 @@ allprojects {
4444
maven { url 'https://www.jitpack.io' }
4545
}
4646
}
47+
48+
subprojects {
49+
ext {
50+
compileSdk = rootProject.ext.compileSdkVersion
51+
minSdk = rootProject.ext.minSdkVersion
52+
targetSdk = rootProject.ext.targetSdkVersion
53+
}
54+
afterEvaluate { subproject ->
55+
if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
56+
android {
57+
compileSdkVersion rootProject.ext.compileSdkVersion
58+
buildToolsVersion rootProject.ext.buildToolsVersion
59+
defaultConfig {
60+
minSdkVersion rootProject.ext.minSdkVersion
61+
targetSdkVersion rootProject.ext.targetSdkVersion
62+
}
63+
}
64+
}
65+
}
66+
}

example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,11 @@ EXTERNAL SOURCES:
423423

424424
SPEC CHECKSUMS:
425425
boost: a7c83b31436843459a1961bfd74b96033dc77234
426-
DoubleConversion: cde416483dac037923206447da6e1454df403714
426+
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
427427
FBLazyVector: dce905f90eacf2e62ffbc2a4bbda8ea630aabd8a
428428
FBReactNativeSpec: 7444057cd46e87525b82f3e41f05e1db0d0029f2
429429
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
430-
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
430+
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
431431
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
432432
RCTRequired: 1af97c470c81e8cbb92c5ae42c4838ea95761743
433433
RCTTypeSafety: 809546c781453daf95eb1c40aa8b6970a4487028

example/src/App.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ import { Logger } from './plugins/Logger';
2323
// import { FacebookAppEventsPlugin } from '@segment/analytics-react-native-plugin-facebook-app-events';
2424

2525
// @ts-ignore
26-
import { IdfaPlugin } from '@segment/analytics-react-native-plugin-idfa';
26+
// import { IdfaPlugin } from '@segment/analytics-react-native-plugin-idfa';
2727
// @ts-ignore
2828
import { AmplitudeSessionPlugin } from '@segment/analytics-react-native-plugin-amplitude-session';
2929

3030
const segmentClient = createClient({
3131
writeKey: 'WRITE KEY',
3232
trackAppLifecycleEvents: true,
3333
collectDeviceId: true,
34+
debug: true,
3435
});
3536

3637
const LoggerPlugin = new Logger();
@@ -42,7 +43,7 @@ segmentClient.add({ plugin: LoggerPlugin });
4243
// To test the Facebook App Events plugin make sure to add your Facebook App Id to Info.plist
4344
// segmentClient.add({ plugin: new FacebookAppEventsPlugin() });
4445

45-
segmentClient.add({ plugin: new IdfaPlugin() });
46+
// segmentClient.add({ plugin: new IdfaPlugin() });
4647
segmentClient.add({ plugin: new AmplitudeSessionPlugin() });
4748

4849
const MainStack = createStackNavigator();

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"homepage": "https://github.com/segmentio/analytics-react-native#readme",
4646
"dependencies": {
4747
"@react-native-async-storage/async-storage": "^1.15.17",
48-
"@segment/sovran-react-native": "^0.2.1",
48+
"@segment/sovran-react-native": "0.2.2",
4949
"js-base64": "^3.7.2",
5050
"nanoid": "^3.1.25",
5151
"react": "^17.0.2",

yarn.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2705,13 +2705,15 @@
27052705
conventional-recommended-bump "^6.1.0"
27062706
prepend-file "^2.0.0"
27072707

2708-
"@segment/sovran-react-native@^0.2.1":
2709-
version "0.2.1"
2710-
resolved "https://registry.yarnpkg.com/@segment/sovran-react-native/-/sovran-react-native-0.2.1.tgz#3bb612f1d53c54edf3fb6dd2baa321f4b9df8e46"
2711-
integrity sha512-60uFgZHuH78uYW2Tuin1qughOVF+GFxFfzcMInWrNB9TD1Qnge1bMYMqFFRkM7NZTY6ET7n3SsMdwehLN1M0rQ==
2708+
"@segment/[email protected].2":
2709+
version "0.2.2"
2710+
resolved "https://registry.yarnpkg.com/@segment/sovran-react-native/-/sovran-react-native-0.2.2.tgz#6250b98f6eb5e355f0c752fa80abc3021107ff7a"
2711+
integrity sha512-3JhYTiXsCpt/2ETRvXP0mg3XO/xLkSGH9g8Ydl5mjoLlJLsWaaL/R5EFt6gENx20fnn4/95yTG5wmDndO5dtFQ==
27122712
dependencies:
27132713
"@react-native-async-storage/async-storage" "^1.15.15"
27142714
deepmerge "^4.2.2"
2715+
react "^17.0.2"
2716+
react-native "^0.66.0"
27152717

27162718
"@sideway/address@^4.1.0":
27172719
version "4.1.2"
@@ -9086,10 +9088,10 @@ react-native-fbsdk-next@^4.6.0:
90869088
resolved "https://registry.yarnpkg.com/react-native-fbsdk-next/-/react-native-fbsdk-next-4.6.0.tgz#0e70aa6d64e99762e6b22b1344eebae3f7fbfcb5"
90879089
integrity sha512-FPYLUFSWf7V4i084jKpSt8tc1DLkuBm38eYdq4RwpGcojxXIciQ8qQi9DRLNAxqNZHd0G/P6edSVEGsrjtvV7w==
90889090

9089-
9090-
version "0.66.3"
9091-
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.66.3.tgz#25c7c4c7d81867326b3eb7a36f0fe6a61fa4104e"
9092-
integrity sha512-B/dQpuvta9YvF5MihDWefoGlTvxzUHK5X5RjdrXHAu/ihTehJXxEA+m6z/tufp1ZUMDjU+tMZK6gnehzCuYfzw==
9091+
react-native@^0.66.0, react-native@^0.66.3:
9092+
version "0.66.4"
9093+
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.66.4.tgz#bf89a5fb18bd23046d889fb4de4ea2822a4d7805"
9094+
integrity sha512-9vx5dlSfQlKbbDtr8+xMon6qsmSu7jvjdXWZpEKh3XVKpUidbbODv7048gwVKX8YAel1egeR7hN8vzSeI6ssTw==
90939095
dependencies:
90949096
"@jest/create-cache-key-function" "^27.0.1"
90959097
"@react-native-community/cli" "^6.0.0"
@@ -9128,7 +9130,7 @@ react-refresh@^0.4.0:
91289130
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
91299131
integrity sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==
91309132

9131-
9133+
react@^17.0.2:
91329134
version "17.0.2"
91339135
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
91349136
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==

0 commit comments

Comments
 (0)