fix: setting minSDK to > 21 for Android and updating to sovran 0.2.2 (s…

…egmentio#430) Co-authored-by: Oscar Bazaldua <oscar.bazaldua@outlook.com>
uswitch · Feb 3, 2022 · 4c6e977 · 4c6e977
1 parent a0ca6c5
commit 4c6e977
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -44,3 +44,23 @@ allprojects {
         maven { url 'https://www.jitpack.io' }
     }
 }
+
+subprojects { 
+    ext {
+        compileSdk = rootProject.ext.compileSdkVersion
+        minSdk = rootProject.ext.minSdkVersion
+        targetSdk = rootProject.ext.targetSdkVersion
+    }
+    afterEvaluate { subproject ->
+        if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                compileSdkVersion rootProject.ext.compileSdkVersion
+                buildToolsVersion rootProject.ext.buildToolsVersion
+                defaultConfig {
+                    minSdkVersion rootProject.ext.minSdkVersion
+                    targetSdkVersion rootProject.ext.targetSdkVersion
+                }
+            }
+        }
+    }
+}
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -423,11 +423,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: dce905f90eacf2e62ffbc2a4bbda8ea630aabd8a
   FBReactNativeSpec: 7444057cd46e87525b82f3e41f05e1db0d0029f2
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
   RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
   RCTRequired: 1af97c470c81e8cbb92c5ae42c4838ea95761743
   RCTTypeSafety: 809546c781453daf95eb1c40aa8b6970a4487028

diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -23,14 +23,15 @@ import { Logger } from './plugins/Logger';
 // import { FacebookAppEventsPlugin } from '@segment/analytics-react-native-plugin-facebook-app-events';
 
 // @ts-ignore
-import { IdfaPlugin } from '@segment/analytics-react-native-plugin-idfa';
+// import { IdfaPlugin } from '@segment/analytics-react-native-plugin-idfa';
 // @ts-ignore
 import { AmplitudeSessionPlugin } from '@segment/analytics-react-native-plugin-amplitude-session';
 
 const segmentClient = createClient({
   writeKey: 'WRITE KEY',
   trackAppLifecycleEvents: true,
   collectDeviceId: true,
+  debug: true,
 });
 
 const LoggerPlugin = new Logger();
@@ -42,7 +43,7 @@ segmentClient.add({ plugin: LoggerPlugin });
 // To test the Facebook App Events plugin make sure to add your Facebook App Id to Info.plist
 // segmentClient.add({ plugin: new FacebookAppEventsPlugin() });
 
-segmentClient.add({ plugin: new IdfaPlugin() });
+// segmentClient.add({ plugin: new IdfaPlugin() });
 segmentClient.add({ plugin: new AmplitudeSessionPlugin() });
 
 const MainStack = createStackNavigator();

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -45,7 +45,7 @@
   "homepage": "https://github.com/segmentio/analytics-react-native#readme",
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.15.17",
-    "@segment/sovran-react-native": "^0.2.1",
+    "@segment/sovran-react-native": "0.2.2",
     "js-base64": "^3.7.2",
     "nanoid": "^3.1.25",
     "react": "^17.0.2",

diff --git a/yarn.lock b/yarn.lock
@@ -2705,13 +2705,15 @@
     conventional-recommended-bump "^6.1.0"
     prepend-file "^2.0.0"
 
-"@segment/sovran-react-native@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@segment/sovran-react-native/-/sovran-react-native-0.2.1.tgz#3bb612f1d53c54edf3fb6dd2baa321f4b9df8e46"
-  integrity sha512-60uFgZHuH78uYW2Tuin1qughOVF+GFxFfzcMInWrNB9TD1Qnge1bMYMqFFRkM7NZTY6ET7n3SsMdwehLN1M0rQ==
+"@segment/sovran-react-native@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@segment/sovran-react-native/-/sovran-react-native-0.2.2.tgz#6250b98f6eb5e355f0c752fa80abc3021107ff7a"
+  integrity sha512-3JhYTiXsCpt/2ETRvXP0mg3XO/xLkSGH9g8Ydl5mjoLlJLsWaaL/R5EFt6gENx20fnn4/95yTG5wmDndO5dtFQ==
   dependencies:
     "@react-native-async-storage/async-storage" "^1.15.15"
     deepmerge "^4.2.2"
+    react "^17.0.2"
+    react-native "^0.66.0"
 
 "@sideway/address@^4.1.0":
   version "4.1.2"
@@ -9086,10 +9088,10 @@ react-native-fbsdk-next@^4.6.0:
   resolved "https://registry.yarnpkg.com/react-native-fbsdk-next/-/react-native-fbsdk-next-4.6.0.tgz#0e70aa6d64e99762e6b22b1344eebae3f7fbfcb5"
   integrity sha512-FPYLUFSWf7V4i084jKpSt8tc1DLkuBm38eYdq4RwpGcojxXIciQ8qQi9DRLNAxqNZHd0G/P6edSVEGsrjtvV7w==
 
-react-native@0.66.3:
-  version "0.66.3"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.66.3.tgz#25c7c4c7d81867326b3eb7a36f0fe6a61fa4104e"
-  integrity sha512-B/dQpuvta9YvF5MihDWefoGlTvxzUHK5X5RjdrXHAu/ihTehJXxEA+m6z/tufp1ZUMDjU+tMZK6gnehzCuYfzw==
+react-native@^0.66.0, react-native@^0.66.3:
+  version "0.66.4"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.66.4.tgz#bf89a5fb18bd23046d889fb4de4ea2822a4d7805"
+  integrity sha512-9vx5dlSfQlKbbDtr8+xMon6qsmSu7jvjdXWZpEKh3XVKpUidbbODv7048gwVKX8YAel1egeR7hN8vzSeI6ssTw==
   dependencies:
     "@jest/create-cache-key-function" "^27.0.1"
     "@react-native-community/cli" "^6.0.0"
@@ -9128,7 +9130,7 @@ react-refresh@^0.4.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
   integrity sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==
 
-react@17.0.2:
+react@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
   integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==