From 4740d861021f667f0223d7351a1da6f90cc2e417 Mon Sep 17 00:00:00 2001 From: diegolmello Date: Mon, 5 Aug 2019 13:47:32 -0300 Subject: [PATCH] Disable ci cache --- .circleci/config.yml | 42 ++-- ...nimodules+react-native-adapter+3.0.0.patch | 15 +- patches/expo-constants+6.0.0.patch | 24 -- patches/expo-file-system+6.0.0.patch | 38 ---- patches/expo-haptics+6.0.0.patch | 35 --- patches/expo-permissions+6.0.0.patch | 37 ---- patches/expo-web-browser+6.0.0.patch | 209 ------------------ patches/react-native-audio+4.3.0.patch | 15 -- 8 files changed, 22 insertions(+), 393 deletions(-) delete mode 100644 patches/expo-constants+6.0.0.patch delete mode 100644 patches/expo-file-system+6.0.0.patch delete mode 100644 patches/expo-haptics+6.0.0.patch delete mode 100644 patches/expo-permissions+6.0.0.patch delete mode 100644 patches/expo-web-browser+6.0.0.patch delete mode 100644 patches/react-native-audio+4.3.0.patch diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ff546a6b..931cf0eef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,9 +14,9 @@ jobs: steps: - checkout - - restore_cache: - name: Restore NPM cache - key: node-modules-{{ checksum "yarn.lock" }} + # - restore_cache: + # name: Restore NPM cache + # key: node-modules-{{ checksum "yarn.lock" }} - run: name: Install NPM modules @@ -38,11 +38,11 @@ jobs: command: | yarn codecov - - save_cache: - key: node-modules-{{ checksum "yarn.lock" }} - name: Save NPM cache - paths: - - ./node_modules + # - save_cache: + # key: node-modules-{{ checksum "yarn.lock" }} + # name: Save NPM cache + # paths: + # - ./node_modules e2e-test: macos: @@ -125,9 +125,9 @@ jobs: command: | yarn - - restore_cache: - name: Restore gradle cache - key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + # - restore_cache: + # name: Restore gradle cache + # key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} - run: name: Configure Gradle @@ -171,17 +171,17 @@ jobs: - store_artifacts: path: /tmp/build/outputs - - save_cache: - name: Save NPM cache - key: node-modules-{{ checksum "yarn.lock" }} - paths: - - ./node_modules + # - save_cache: + # name: Save NPM cache + # key: node-modules-{{ checksum "yarn.lock" }} + # paths: + # - ./node_modules - - save_cache: - name: Save gradle cache - key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} - paths: - - ~/.gradle + # - save_cache: + # name: Save gradle cache + # key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + # paths: + # - ~/.gradle ios-build: macos: diff --git a/patches/@unimodules+react-native-adapter+3.0.0.patch b/patches/@unimodules+react-native-adapter+3.0.0.patch index 218f24197..f1f32cbd0 100644 --- a/patches/@unimodules+react-native-adapter+3.0.0.patch +++ b/patches/@unimodules+react-native-adapter+3.0.0.patch @@ -14,17 +14,4 @@ index 70d03a5..d17b348 100644 + // } + implementation 'com.facebook.react:react-native:+' api 'com.github.bumptech.glide:glide:4.9.0' - } -diff --git a/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java b/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java -index 6541f47..d86d4d3 100644 ---- a/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java -+++ b/node_modules/@unimodules/react-native-adapter/android/src/main/java/org/unimodules/adapters/react/services/UIManagerModuleWrapper.java -@@ -5,7 +5,7 @@ import android.content.Intent; - import android.graphics.Bitmap; - import android.graphics.drawable.Drawable; - import android.os.AsyncTask; --import android.support.annotation.NonNull; -+import androidx.annotation.NonNull; - import android.util.Log; - import android.view.View; - + } \ No newline at end of file diff --git a/patches/expo-constants+6.0.0.patch b/patches/expo-constants+6.0.0.patch deleted file mode 100644 index 43dfa666b..000000000 --- a/patches/expo-constants+6.0.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/node_modules/expo-constants/android/build.gradle b/node_modules/expo-constants/android/build.gradle -index 5afacdf..b1054a0 100644 ---- a/node_modules/expo-constants/android/build.gradle -+++ b/node_modules/expo-constants/android/build.gradle -@@ -75,5 +75,5 @@ dependencies { - unimodule 'unimodules-constants-interface' - - api 'com.facebook.device.yearclass:yearclass:2.1.0' -- api "com.android.support:support-annotations:${safeExtGet("supportLibVersion", "28.0.0")}" -+ api "androidx.annotation:annotation:1.0.0" - } -diff --git a/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java b/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java -index 4989672..888d84f 100644 ---- a/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java -+++ b/node_modules/expo-constants/android/src/main/java/expo/modules/constants/ConstantsService.java -@@ -3,7 +3,7 @@ package expo.modules.constants; - import android.content.Context; - import android.content.res.Resources; - import android.os.Build; --import android.support.annotation.Nullable; -+import androidx.annotation.Nullable; - import android.util.DisplayMetrics; - - import com.facebook.device.yearclass.YearClass; diff --git a/patches/expo-file-system+6.0.0.patch b/patches/expo-file-system+6.0.0.patch deleted file mode 100644 index 141dd9642..000000000 --- a/patches/expo-file-system+6.0.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/node_modules/expo-file-system/android/build.gradle b/node_modules/expo-file-system/android/build.gradle -index cd9ab67..83764fd 100644 ---- a/node_modules/expo-file-system/android/build.gradle -+++ b/node_modules/expo-file-system/android/build.gradle -@@ -78,6 +78,6 @@ dependencies { - api 'commons-io:commons-io:1.4' - api 'com.squareup.okhttp3:okhttp:3.10.0' - api 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0' -- api "com.android.support:support-v4:${safeExtGet("supportLibVersion", "28.0.0")}" -+ api "androidx.legacy:legacy-support-v4:1.0.0" - } - -diff --git a/node_modules/expo-file-system/android/src/main/AndroidManifest.xml b/node_modules/expo-file-system/android/src/main/AndroidManifest.xml -index da97401..ec3f033 100644 ---- a/node_modules/expo-file-system/android/src/main/AndroidManifest.xml -+++ b/node_modules/expo-file-system/android/src/main/AndroidManifest.xml -@@ -9,7 +9,7 @@ - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java -index 26d4c53..1c582a0 100644 ---- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java -+++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsActivitiesHelper.java -@@ -5,10 +5,10 @@ import android.content.Intent; - import android.content.pm.PackageManager; - import android.content.pm.ResolveInfo; - import android.net.Uri; --import android.support.annotation.NonNull; --import android.support.annotation.Nullable; --import android.support.customtabs.CustomTabsClient; --import android.support.customtabs.CustomTabsIntent; -+import androidx.annotation.NonNull; -+import androidx.annotation.Nullable; -+import androidx.browser.customtabs.CustomTabsClient; -+import androidx.browser.customtabs.CustomTabsIntent; - - import org.unimodules.core.ModuleRegistry; - import org.unimodules.core.errors.CurrentActivityNotFoundException; -@@ -22,7 +22,7 @@ import java.util.List; - - import expo.modules.webbrowser.error.PackageManagerNotFoundException; - --import static android.support.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION; -+import static androidx.browser.customtabs.CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION; - - class CustomTabsActivitiesHelper { - -diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java -index 1b783a3..08647a8 100644 ---- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java -+++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/CustomTabsConnectionHelper.java -@@ -3,9 +3,9 @@ package expo.modules.webbrowser; - import android.content.ComponentName; - import android.content.Context; - import android.net.Uri; --import android.support.customtabs.CustomTabsClient; --import android.support.customtabs.CustomTabsServiceConnection; --import android.support.customtabs.CustomTabsSession; -+import androidx.browser.customtabs.CustomTabsClient; -+import androidx.browser.customtabs.CustomTabsServiceConnection; -+import androidx.browser.customtabs.CustomTabsSession; - - import org.unimodules.core.interfaces.LifecycleEventListener; - -diff --git a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java -index 4112a7d..660d67b 100644 ---- a/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java -+++ b/node_modules/expo-web-browser/android/src/main/java/expo/modules/webbrowser/WebBrowserModule.java -@@ -6,8 +6,8 @@ import android.content.pm.ResolveInfo; - import android.graphics.Color; - import android.net.Uri; - import android.os.Bundle; --import android.support.annotation.Nullable; --import android.support.customtabs.CustomTabsIntent; -+import androidx.annotation.Nullable; -+import androidx.browser.customtabs.CustomTabsIntent; - import android.text.TextUtils; - - import org.unimodules.core.ExportedModule; diff --git a/patches/react-native-audio+4.3.0.patch b/patches/react-native-audio+4.3.0.patch deleted file mode 100644 index 3264c7a8f..000000000 --- a/patches/react-native-audio+4.3.0.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java b/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java -index f6cecf6..e9070b5 100644 ---- a/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java -+++ b/node_modules/react-native-audio/android/src/main/java/com/rnim/rn/audio/AudioRecorderManager.java -@@ -27,8 +27,8 @@ import android.os.Build; - import android.os.Environment; - import android.media.MediaRecorder; - import android.media.AudioManager; --import android.support.v4.app.ActivityCompat; --import android.support.v4.content.ContextCompat; -+import androidx.core.app.ActivityCompat; -+import androidx.core.content.ContextCompat; - import android.util.Base64; - import android.util.Log; - import com.facebook.react.modules.core.DeviceEventManagerModule;