[#165213273] Fix Android build (pagopa#937)

dvisionlab · Apr 9, 2019 · 5183901 · 5183901
1 parent b711027
commit 5183901
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 100 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,8 +20,9 @@ defaults_android: &defaults_android
     - image: circleci/android:api-23-node8-alpha
   environment:
     - TERM: "dumb"
-    - ANDROID_SDK_BUILD_TOOLS_REVISION: "27.0.3"
-    - ANDROID_SDK_BUILD_API_LEVEL: "27"
+    - ANDROID_SDK_BUILD_TOOLS_REVISION: "28.0.3"
+    - ANDROID_SDK_BUILD_API_LEVEL: "28"
+    - ANDROID_GOOGLE_API_LEVEL: "23"
     - REACT_NATIVE_MAX_WORKERS: 1
     - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError"'
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
     - React/Core (= 0.59.3)
   - react-native-background-timer (2.1.1):
     - React
-  - react-native-calendar-events (1.6.4):
+  - react-native-calendar-events (1.7.1):
     - React
   - react-native-camera (1.2.0):
     - React
@@ -19,7 +19,7 @@ PODS:
   - react-native-mixpanel (0.0.6):
     - Mixpanel
     - React
-  - react-native-splash-screen (3.1.1):
+  - react-native-splash-screen (3.2.0):
     - React
   - react-native-webview (5.4.2):
     - React
@@ -155,11 +155,11 @@ SPEC CHECKSUMS:
   Mixpanel: 3c3925c27f7a321d5978319a72f53f8f0885afc5
   React: b52fdb80565505b7e4592b313a38868f5df51641
   react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b
-  react-native-calendar-events: cafbac5457a0dc449e3fb407814b2091b7f259be
+  react-native-calendar-events: 667f4141959b3f90c44cd328396c1488f216922d
   react-native-camera: 74c7513056d1513686286a0d54426083ca8a0088
   react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342
   react-native-mixpanel: bdb451e8455940a12fdd157c2146a68c5f80310d
-  react-native-splash-screen: 353334c5ae82d8c74501ea7cbb916cb7cb20c8bf
+  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-webview: 84a2f3b7d1db70f43a58ce492b9449c15827e0ad
   ReactNativePermissions: b64e084dff6a5cad51587d38c306f09246246384
   RNDeviceInfo: e7c5fcde13d40e161d8a27f6c5dc69c638936002

diff --git a/package.json b/package.json
@@ -41,12 +41,12 @@
     "react-native": "0.59.3",
     "react-native-android-open-settings": "^1.3.0",
     "react-native-background-timer": "2.1.1",
-    "react-native-calendar-events": "1.6.4",
+    "react-native-calendar-events": "1.7.1",
     "react-native-camera": "1.2.0",
     "react-native-config": "0.11.7",
     "react-native-device-info": "^0.22",
     "react-native-exception-handler": "2.10.0",
-    "react-native-flag-secure-android": "git://github.com/teamdigitale/react-native-flag-secure-android.git#8904c847ae321eb2c18408ef75424230b3760c88",
+    "react-native-flag-secure-android": "git://github.com/teamdigitale/react-native-flag-secure-android.git#7afcf2a418b945f976a4f0e7a72e89301253c795",
     "react-native-fs": "^2.13.3",
     "react-native-gesture-handler": "^1.0.16",
     "react-native-i18n": "^2.0.15",
@@ -57,9 +57,9 @@
     "react-native-push-notification": "git://github.com/zo0r/react-native-push-notification#aaf2d19925db4666d6018c0ab1ff0d7d4c90a21d",
     "react-native-qrcode-scanner": "^1.1.0",
     "react-native-sha256": "1.2.3",
-    "react-native-splash-screen": "^3.1.1",
+    "react-native-splash-screen": "^3.2.0",
     "react-native-svg": "^6.5.3",
-    "react-native-text-input-mask": "^0.8.0",
+    "react-native-text-input-mask": "^0.9.0",
     "react-native-touch-id": "git://github.com/naoufal/react-native-touch-id#d2ff356f5dbed4ad647b26110f5053ed41f522a4",
     "react-native-vector-icons": "^6.4.2",
     "react-native-webview": "^5.4.2",

diff --git a/patches/react-native-calendar-events+1.6.4.patch b/patches/react-native-calendar-events+1.6.4.patch
diff --git a/.../react-native-text-input-mask+0.8.0.patch → .../react-native-text-input-mask+0.9.0.patch b/.../react-native-text-input-mask+0.8.0.patch → .../react-native-text-input-mask+0.9.0.patch
diff --git a/scripts/circleci-android-setup.sh b/scripts/circleci-android-setup.sh
@@ -4,7 +4,7 @@ echo "Installing build SDK for Android API level $ANDROID_SDK_BUILD_API_LEVEL...
 echo y | sdkmanager "platforms;android-$ANDROID_SDK_BUILD_API_LEVEL"
 echo "Installing SDK build tools, revision $ANDROID_SDK_BUILD_TOOLS_REVISION..."
 echo y | sdkmanager "build-tools;$ANDROID_SDK_BUILD_TOOLS_REVISION"
-echo "Installing Google APIs for Android API level $ANDROID_SDK_BUILD_API_LEVEL..."
-echo y | sdkmanager "add-ons;addon-google_apis-google-$ANDROID_SDK_BUILD_API_LEVEL"
+echo "Installing Google APIs for Android API level $ANDROID_GOOGLE_API_LEVEL..."
+echo y | sdkmanager "add-ons;addon-google_apis-google-$ANDROID_GOOGLE_API_LEVEL"
 echo "Installing Android Support Repository"
 echo y | sdkmanager "extras;android;m2repository"
diff --git a/ts/@types/react-native-calendar-events.d.ts b/ts/@types/react-native-calendar-events.d.ts
diff --git a/ts/components/messages/MessageCTABar.tsx b/ts/components/messages/MessageCTABar.tsx
@@ -407,7 +407,6 @@ class MessageCTABar extends React.PureComponent<Props, State> {
     }
 
     RNCalendarEvents.saveEvent(title, {
-      title,
       calendarId: calendar.id,
       startDate: formatDateAsReminder(dueDate),
       endDate: formatDateAsReminder(dueDate),

diff --git a/yarn.lock b/yarn.lock
@@ -7291,10 +7291,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.1.1.tgz#9a2489681ab2f8033c213c73272e9d4c47572cd5"
   integrity sha512-cuXIIv+dcG8a8qkTD8pMzeqOEZCO+UGKglZWIe1osve+yJslmCowYQff+bI9xa7NOt2w+Vtd4L3d9JonlSqODg==
 
-react-native-calendar-events@1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.6.4.tgz#e1ccfe50e48b385a00847c41f9fb2a97e756e72e"
-  integrity sha512-By4lgWQG9eewS9WzhzxVHAewxX40v1CzLnNYXFMOqF06fYVCNykiiTMGlLzz3UXHVwwN1Drxw9uWroQfGRFMsw==
+react-native-calendar-events@1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.7.1.tgz#177dcac0a3c711f1190ce107f6299e47aabba645"
+  integrity sha512-Kixqf4Evu+keQa5H6T1Pq2Hu5JPQLGxNp9NA4nf75QjT3tAT6naZX9RIltlnUX9+va2cWbJ5hoTQ6VXax1CRNA==
 
 [email protected]:
   version "1.2.0"
@@ -7333,9 +7333,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/react-native-exception-handler/-/react-native-exception-handler-2.10.0.tgz#0d828a4f2c7c4469a2929fa46d20535def726903"
   integrity sha512-MJLE1NxGFlsdoOk3jBXUMzceZyVuLLXGWjK406ABH5+mfFjbIjmxAAEm/pkvzD8E5QXNo1chUSzpwtq2wCjygA==
 
-"react-native-flag-secure-android@git://github.com/teamdigitale/react-native-flag-secure-android.git#8904c847ae321eb2c18408ef75424230b3760c88":
+"react-native-flag-secure-android@git://github.com/teamdigitale/react-native-flag-secure-android.git#7afcf2a418b945f976a4f0e7a72e89301253c795":
   version "1.0.0"
-  resolved "git://github.com/teamdigitale/react-native-flag-secure-android.git#8904c847ae321eb2c18408ef75424230b3760c88"
+  resolved "git://github.com/teamdigitale/react-native-flag-secure-android.git#7afcf2a418b945f976a4f0e7a72e89301253c795"
 
 react-native-fs@^2.13.3:
   version "2.13.3"
@@ -7425,9 +7425,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/react-native-sha256/-/react-native-sha256-1.2.3.tgz#59eaa2c260882ed1e4de94c88e0383726cddc40c"
   integrity sha512-3KQBrAKnB8BAhQuyIBg4p1vsCU6A4LPCTjdNDhFomIaCaDLswEyb4GZoyGWPooTPyKVGd8aCR4pd7/Js9o1ySQ==
 
-react-native-splash-screen@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.1.1.tgz#1a4e46c9fdce53ff52af2a2cb4181788c4e30b30"
+react-native-splash-screen@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45"
+  integrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg==
 
 react-native-svg@^6.5.3:
   version "6.5.3"
@@ -7445,9 +7446,10 @@ react-native-tab-view@^1.0.0, react-native-tab-view@^1.2.0:
   dependencies:
     prop-types "^15.6.1"
 
-react-native-text-input-mask@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/react-native-text-input-mask/-/react-native-text-input-mask-0.8.0.tgz#30f0de0215644db10719c4b1d29610605fb57262"
+react-native-text-input-mask@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/react-native-text-input-mask/-/react-native-text-input-mask-0.9.0.tgz#0dc51ed1a3f3008dfb109ce9babf30b06acf7ee2"
+  integrity sha512-VUzGyYjJ1HQFzYzAo3psYvEljMZ9/cgspdRQH6m849+7FU8koLaHI+BNLyMnYdhivNRq64FTfrqgQ6NP1u10ZQ==
 
 "react-native-touch-id@git://github.com/naoufal/react-native-touch-id#d2ff356f5dbed4ad647b26110f5053ed41f522a4":
   version "4.3.0"