From 0e2bcdad21bb4ec756a63a1a7784fd610ef53f22 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 10:10:11 -0400 Subject: [PATCH 01/49] Android x migration on gutenberg-mobile --- android/app/build.gradle | 2 +- android/gradle.properties | 2 ++ react-native-aztec/android/build.gradle | 12 ++++++------ .../mobile/ReactNativeAztec/ReactAztecManager.java | 2 +- .../mobile/ReactNativeAztec/ReactAztecText.java | 2 +- .../ReactNativeAztec/ReactAztecTextShadowNode.java | 2 +- .../RNReactNativeGutenbergBridgeModule.java | 2 +- .../mobile/WPAndroidGlue/WPAndroidGlueCode.java | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 073f26b6d0..0287544ac4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,7 +156,7 @@ dependencies { implementation project(':react-native-recyclerview-list') implementation project(':react-native-gutenberg-bridge') implementation "org.wordpress:utils:$wordpressUtilsVersion" - implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation 'androidx.appcompat:appcompat:1.0.0' implementation "com.facebook.react:react-native:+" // From node_modules } diff --git a/android/gradle.properties b/android/gradle.properties index 89e0d99e21..915f0e66f9 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -16,3 +16,5 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle index 4c88e0ed69..bde68fbf97 100644 --- a/react-native-aztec/android/build.gradle +++ b/react-native-aztec/android/build.gradle @@ -100,14 +100,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - implementation "com.android.support:appcompat-v7:$supportLibVersion" + implementation 'androidx.appcompat:appcompat:1.0.0' implementation "org.wordpress:utils:$wordpressUtilsVersion" - implementation "com.android.support:support-v4:$supportLibVersion" - implementation "com.android.support:gridlayout-v7:$supportLibVersion" - implementation "com.android.support:cardview-v7:$supportLibVersion" - implementation "com.android.support:appcompat-v7:$supportLibVersion" - implementation "com.android.support:recyclerview-v7:$supportLibVersion" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.gridlayout:gridlayout:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' if (rootProject.ext.buildGutenbergFromSource) { implementation "com.facebook.react:react-native:+" // From node_modules. diff --git a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java index fbb9272c21..bfe1398370 100644 --- a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java +++ b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java @@ -4,7 +4,7 @@ import android.graphics.Color; import android.graphics.Typeface; import android.os.Build; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.Layout; import android.text.TextUtils; diff --git a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java index c43db07028..379b59ba27 100644 --- a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java +++ b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java @@ -6,7 +6,7 @@ import android.graphics.Rect; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.InputType; import android.text.Spannable; diff --git a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java index d2185d04a8..5be81e2d53 100644 --- a/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java +++ b/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java @@ -1,6 +1,6 @@ package org.wordpress.mobile.ReactNativeAztec; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.annotations.ReactProp; diff --git a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java index 0351026e8c..24e173e940 100644 --- a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java +++ b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java @@ -1,6 +1,6 @@ package org.wordpress.mobile.ReactNativeGutenbergBridge; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.ReadableArray; diff --git a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java index c723af7734..78a57fc305 100644 --- a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java +++ b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java @@ -7,7 +7,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; From 835856fd97baa3c4e85cb4911863670e2bfde147 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 10:13:23 -0400 Subject: [PATCH 02/49] Point aztecVersion to aztec androidX migration --- react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle index bde68fbf97..b6d3c84bc9 100644 --- a/react-native-aztec/android/build.gradle +++ b/react-native-aztec/android/build.gradle @@ -12,7 +12,7 @@ buildscript { wordpressUtilsVersion = '1.22' espressoVersion = '3.0.1' - aztecVersion = 'v1.3.27' + aztecVersion = '794497db64e63a5751265f484ea07a2fa5d0b0d0' } repositories { From e12417b874c952ab173e5a8ece77b480b5f8e96e Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 10:28:45 -0400 Subject: [PATCH 03/49] Target 0.60-rc.1 --- package.json | 4 +- yarn.lock | 302 ++++++++++++++++++++++++++------------------------- 2 files changed, 159 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index 64c1dd3fb9..b650779ec0 100644 --- a/package.json +++ b/package.json @@ -137,8 +137,8 @@ "moment-timezone": "^0.5.16", "node-libs-react-native": "^1.0.2", "node-sass": "^4.8.3", - "react": "16.8.3", - "react-native": "0.59.3", + "react": "16.8.6", + "react-native": "0.60.0-rc.1", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", diff --git a/yarn.lock b/yarn.lock index b75e280df0..f09c26269d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2071,7 +2071,36 @@ dependencies: core-js "^2.5.7" -"@react-native-community/cli@^1.2.1", "@react-native-community/cli@^1.5.2": +"@react-native-community/cli-platform-android@2.0.0-rc.1": + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.1.tgz#9f14106104b20bd94d05a3ddad79859b566f8996" + integrity sha512-gH+ev65wxuO9KQxYTvpRh3PFCVvYwxJdZecFZDknnedIx49eVxro99svO/wcp1OLdtzxV+ErFolpIFn0gSyVFg== + dependencies: + "@react-native-community/cli-tools" "^2.0.0-rc.1" + logkitty "^0.4.0" + slash "^2.0.0" + xmldoc "^0.4.0" + +"@react-native-community/cli-platform-ios@2.0.0-rc.1": + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.1.tgz#832c8c873193b8829249227fa1d1f734e7aa267e" + integrity sha512-okioIW81pd5vA1tgdSo8nYGnljqhaV91zprrkko6IhMV4sr/eGlN0D/cyFhUXmnBj6q63+X4Ulr809wqXjJ14w== + dependencies: + "@react-native-community/cli-tools" "^2.0.0-rc.1" + chalk "^1.1.1" + xcode "^2.0.0" + +"@react-native-community/cli-tools@^2.0.0-rc.1": + version "2.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.1.tgz#a8c3f76e0c33ab689c1c769cbbed83add5c13b11" + integrity sha512-ZUc5s/aGdg7d3dT9eMAzKqWd5Lsa42TrsUWjcqaG7WTYUPIUHTWOcpnRLV4B5MUfmEEt3mboOoQZRUcDltz8kA== + dependencies: + chalk "^1.1.1" + lodash "^4.17.5" + mime "^2.4.1" + node-fetch "^2.5.0" + +"@react-native-community/cli@2.0.0-rc.1", "@react-native-community/cli@^1.5.2": version "1.6.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.6.0.tgz#889fbb1eff961945df28bb7e896dcee8516b010f" integrity sha512-OV3N5O/wzjb8OTZDiFerX0gf9/KzLJOvDttU38BqIvn8+OLkH6SIgGrKked9vrKKvH5bFG6jmCmKCW5gP+tOwQ== @@ -2259,6 +2288,13 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + absolute-path@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" @@ -2369,6 +2405,15 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-fragments@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ansi-fragments/-/ansi-fragments-0.2.1.tgz#24409c56c4cc37817c3d7caa99d8969e2de5a05e" + integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w== + dependencies: + colorette "^1.0.7" + slice-ansi "^2.0.0" + strip-ansi "^5.0.0" + ansi-gray@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251" @@ -2415,11 +2460,6 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0: resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= -ansi@^0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - any-base@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" @@ -3469,7 +3509,7 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== -babel-preset-fbjs@^3.0.0, babel-preset-fbjs@^3.0.1, babel-preset-fbjs@^3.1.2: +babel-preset-fbjs@^3.0.1, babel-preset-fbjs@^3.1.2, babel-preset-fbjs@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.2.0.tgz#c0e6347d3e0379ed84b3c2434d3467567aa05297" integrity sha512-5Jo+JeWiVz2wHUUyAlvb/sSYnXNig9r+HqGAOSfh5Fzxp7SnAaR/tEGRJ1ZX7C77kfk82658w6R5Z+uPATTD9g== @@ -4198,6 +4238,11 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" +colorette@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.0.8.tgz#421ff11c80b7414027ebed922396bc1833d1903c" + integrity sha512-X6Ck90ReaF+EfKdVGB7vdIQ3dr651BbIrBwY5YBKg13fjH+940sTtp7/Pkx33C6ntYfQcRumOs/aUQhaRPpbTQ== + colornames@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" @@ -5485,10 +5530,10 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -event-target-shim@^1.0.5: - version "1.1.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-1.1.1.tgz#a86e5ee6bdaa16054475da797ccddf0c55698491" - integrity sha1-qG5e5r2qFgVEddp5fM3fDFVphJE= +event-target-shim@^5.0.0, event-target-shim@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== eventemitter2@^1.0.0: version "1.0.5" @@ -5816,14 +5861,14 @@ fbjs-css-vars@^1.0.0: resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== -fbjs-scripts@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.1.0.tgz#d9e855aed19b572be9dfe39da70d8aece724eed9" - integrity sha512-VMCpHJd76YI2nYOfVM/d9LDAIFTH4uw4/7sAIGEgxk6kaNmirgTY9bLgpla9DTu+DvV2+ufvDxehGbl2U9bYCA== +fbjs-scripts@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.2.0.tgz#069a0c0634242d10031c6460ef1fccefcdae8b27" + integrity sha512-5krZ8T0Bf8uky0abPoCLrfa7Orxd8UH4Qq8hRUF2RZYNMu+FmEOrBc7Ib3YVONmxTXTlLAvyrrdrVmksDb2OqQ== dependencies: "@babel/core" "^7.0.0" ansi-colors "^1.0.1" - babel-preset-fbjs "^3.0.0" + babel-preset-fbjs "^3.2.0" core-js "^2.4.1" cross-spawn "^5.1.0" fancy-log "^1.3.2" @@ -6210,17 +6255,6 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -7798,6 +7832,11 @@ jsc-android@236355.x.x: resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-236355.1.1.tgz#43e153b722e3c60dd0595be4e7430baf65e67c9c" integrity sha512-2py4f0McZIl/oH6AzPj1Ebutc58fyeLvwq6gyVYp1RsWr4qeLNHAPfW3kmfeVMz44oUBJMQ0lECZg9n4KBhHbQ== +jsc-android@^241213.1.0: + version "241213.1.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452" + integrity sha512-AH8NYyMNLNhcUEF97QbMxPNLNW+oiSBlvm1rsMNzgJ1d5TQzdh/AOJGsxeeESp3m9YIWGLCgUvGTVoVLs0p68A== + "jsdom-jscore@git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800": version "0.1.7" resolved "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800" @@ -8219,21 +8258,6 @@ lodash.omitby@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.omitby/-/lodash.omitby-4.6.0.tgz#5c15ff4754ad555016b53c041311e8f079204791" integrity sha1-XBX/R1StVVAWtTwEExHo8HkgR5E= -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= - lodash.range@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash.range/-/lodash.range-3.2.0.tgz#f461e588f66683f7eadeade513e38a69a565a15d" @@ -8275,6 +8299,14 @@ logform@^2.1.1: ms "^2.1.1" triple-beam "^1.3.0" +logkitty@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.4.1.tgz#bbda70eb9f0a3de5f42fb6b47499b9001a4b77d0" + integrity sha512-h8SSUaiyi+SIAUoYdWl+hb1zPF7AjFgmSdt2NulA6YLHmbDkNI+LjkIBw2pxfR70LlR9Y2U31npYwQ5GQ2Gq3g== + dependencies: + ansi-fragments "^0.2.1" + yargs "^12.0.5" + loglevel-colored-level-prefix@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e" @@ -8505,10 +8537,10 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-babel-register@0.51.0: - version "0.51.0" - resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.51.0.tgz#d86d3f2d90b45c7a3c6ae67a53bd1e50bad7a24d" - integrity sha512-rhdvHFOZ7/ub019A3+aYs8YeLydb02/FAMsKr2Nz2Jlf6VUxWrMnrcT0NYX16F9TGdi2ulRlJ9dwvUmdhkk+Bw== +metro-babel-register@0.54.1: + version "0.54.1" + resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.54.1.tgz#7d2bfe444b1ccef8de99aedc7d9330891d806076" + integrity sha512-j3VydgncUG8HP6AZala6GTIt3V01nptodnnOke3JMYLqgk8EJ1LOVOdotK9pXi80o7EmmNKFs/LyyH8z+uAJzQ== dependencies: "@babel/core" "^7.0.0" "@babel/plugin-proposal-class-properties" "^7.0.0" @@ -8523,13 +8555,6 @@ metro-babel-register@0.51.0: core-js "^2.2.2" escape-string-regexp "^1.0.5" -metro-babel-transformer@0.51.0: - version "0.51.0" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.51.0.tgz#9ee5199163ac46b2057527b3f8cbd8b089ffc03e" - integrity sha512-M7KEY/hjD3E8tJEliWgI0VOSaJtqaznC0ItM6FiMrhoGDqqa1BvGofl+EPcKqjBSOV1UgExua/T1VOIWbjwQsw== - dependencies: - "@babel/core" "^7.0.0" - metro-babel-transformer@0.51.1: version "0.51.1" resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.51.1.tgz#97be9e2b96c78aa202b52ae05fb86f71327aef72" @@ -8544,12 +8569,12 @@ metro-babel-transformer@0.53.1: dependencies: "@babel/core" "^7.0.0" -metro-babel7-plugin-react-transform@0.51.0: - version "0.51.0" - resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.0.tgz#af27dd81666b91f05d2b371b0d6d283c585e38b6" - integrity sha512-dZ95kXcE2FJMoRsYhxr7YLCbOlHWKwe0bOpihRhfImDTgFfuKIzU4ROQwMUbE0NCbzB+ATFsa2FZ3pHDJ5GI0w== +metro-babel-transformer@0.54.1: + version "0.54.1" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.54.1.tgz#371ffa2d1118b22cc9e40b3c3ea6738c49dae9dc" + integrity sha512-2aiAnuYBdcLV1VINb8ENAA4keIaJIepHgR9+iRvIde+9GSjKnexqx4nNmJN392285gRDp1fVZ7uY0uQawK/A5g== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/core" "^7.0.0" metro-babel7-plugin-react-transform@0.51.1: version "0.51.1" @@ -8572,6 +8597,13 @@ metro-babel7-plugin-react-transform@0.53.1: dependencies: "@babel/helper-module-imports" "^7.0.0" +metro-babel7-plugin-react-transform@0.54.1: + version "0.54.1" + resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.1.tgz#5335b810284789724886dc483d5bde9c149a1996" + integrity sha512-jWm5myuMoZAOhoPsa8ItfDxdTcOzKhTTzzhFlbZnRamE7i9qybeMdrZt8KHQpF7i2p/mKzE9Yhf4ouOz5K/jHg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + metro-cache@0.51.1: version "0.51.1" resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.51.1.tgz#d0b296eab8e009214413bba87e4eac3d9b44cd04" @@ -8615,10 +8647,10 @@ metro-minify-uglify@0.51.1: dependencies: uglify-es "^3.1.9" -metro-react-native-babel-preset@0.51.0: - version "0.51.0" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.0.tgz#978d960acf2d214bbbe43e59145878d663bd07de" - integrity sha512-Y/aPeLl4RzY8IEAneOyDcpdjto/8yjIuX9eUWRngjSqdHYhGQtqiSBpfTpo0BvXpwNRLwCLHyXo58gNpckTJFw== +metro-react-native-babel-preset@0.51.1: + version "0.51.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz#44aeeedfea37f7c2ab8f6f273fa71b90fe65f089" + integrity sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" @@ -8653,13 +8685,13 @@ metro-react-native-babel-preset@0.51.0: "@babel/plugin-transform-typescript" "^7.0.0" "@babel/plugin-transform-unicode-regex" "^7.0.0" "@babel/template" "^7.0.0" - metro-babel7-plugin-react-transform "0.51.0" + metro-babel7-plugin-react-transform "0.51.1" react-transform-hmr "^1.0.4" -metro-react-native-babel-preset@0.51.1: - version "0.51.1" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz#44aeeedfea37f7c2ab8f6f273fa71b90fe65f089" - integrity sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw== +metro-react-native-babel-preset@0.53.1: + version "0.53.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.53.1.tgz#6cd9e41a1b9a6e210e71ef2adf114219b4eaf2ec" + integrity sha512-Uf8EGL8kIPhDkoSdAAysNPxPQclUS2R1QC4cwnc8bkk2f6yqGn+1CorfiY9AaqlLEth5mKQqdtRYFDTFfB9QyA== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" @@ -8669,6 +8701,7 @@ metro-react-native-babel-preset@0.51.1: "@babel/plugin-proposal-optional-chaining" "^7.0.0" "@babel/plugin-syntax-dynamic-import" "^7.0.0" "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.2.0" "@babel/plugin-transform-arrow-functions" "^7.0.0" "@babel/plugin-transform-block-scoping" "^7.0.0" "@babel/plugin-transform-classes" "^7.0.0" @@ -8694,13 +8727,13 @@ metro-react-native-babel-preset@0.51.1: "@babel/plugin-transform-typescript" "^7.0.0" "@babel/plugin-transform-unicode-regex" "^7.0.0" "@babel/template" "^7.0.0" - metro-babel7-plugin-react-transform "0.51.1" + metro-babel7-plugin-react-transform "0.53.1" react-transform-hmr "^1.0.4" -metro-react-native-babel-preset@0.53.1: - version "0.53.1" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.53.1.tgz#6cd9e41a1b9a6e210e71ef2adf114219b4eaf2ec" - integrity sha512-Uf8EGL8kIPhDkoSdAAysNPxPQclUS2R1QC4cwnc8bkk2f6yqGn+1CorfiY9AaqlLEth5mKQqdtRYFDTFfB9QyA== +metro-react-native-babel-preset@0.54.1: + version "0.54.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.1.tgz#b8f03865c381841d7f8912e7ba46804ea3a928b8" + integrity sha512-Hfr32+u5yYl3qhYQJU8NQ26g4kQlc3yFMg7keVR/3H8rwBIbFqXgsKt8oe0dOrv7WvrMqBHhDtVdU9ls3sSq8g== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-export-default-from" "^7.0.0" @@ -8736,7 +8769,7 @@ metro-react-native-babel-preset@0.53.1: "@babel/plugin-transform-typescript" "^7.0.0" "@babel/plugin-transform-unicode-regex" "^7.0.0" "@babel/template" "^7.0.0" - metro-babel7-plugin-react-transform "0.53.1" + metro-babel7-plugin-react-transform "0.54.1" react-transform-hmr "^1.0.4" metro-react-native-babel-preset@^0.52.0: @@ -8781,15 +8814,15 @@ metro-react-native-babel-preset@^0.52.0: metro-babel7-plugin-react-transform "0.52.0" react-transform-hmr "^1.0.4" -metro-react-native-babel-transformer@0.51.0: - version "0.51.0" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.51.0.tgz#57a695e97a19d95de63c9633f9d0dc024ee8e99a" - integrity sha512-VFnqtE0qrVmU1HV9B04o53+NZHvDwR+CWCoEx4+7vCqJ9Tvas741biqCjah9xtifoKdElQELk6x0soOAWCDFJA== +metro-react-native-babel-transformer@0.54.1: + version "0.54.1" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.54.1.tgz#45b56db004421134e10e739f69e8de50775fef17" + integrity sha512-ECw7xG91t8dk/PHdiyoC5SP1s9OQzfmJzG5m0YOZaKtHMe534qTDbncxaKfTI3CP99yti2maXFBRVj+xyvph/g== dependencies: "@babel/core" "^7.0.0" - babel-preset-fbjs "^3.0.1" - metro-babel-transformer "0.51.0" - metro-react-native-babel-preset "0.51.0" + babel-preset-fbjs "^3.1.2" + metro-babel-transformer "0.54.1" + metro-react-native-babel-preset "0.54.1" metro-react-native-babel-transformer@^0.51.0: version "0.51.1" @@ -8962,6 +8995,11 @@ mime@^1.3.4: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^2.4.1: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -9202,6 +9240,11 @@ node-fetch@^2.2.0, node-fetch@^2.3.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA== +node-fetch@^2.5.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" @@ -9423,15 +9466,6 @@ npm-run-path@^2.0.0: gauge "~2.7.3" set-blocking "~2.0.0" -npmlog@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - nth-check@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -10368,7 +10402,7 @@ prompts@^2.0.1: kleur "^3.0.2" sisteransi "^1.0.0" -prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -10534,11 +10568,6 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-clone-referenced-element@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/react-clone-referenced-element/-/react-clone-referenced-element-1.1.0.tgz#9cdda7f2aeb54fea791f3ab8c6ab96c7a77d0158" - integrity sha512-FKOsfKbBkPxYE8576EM6uAfHC4rnMpLyH6/TJUL4WcHUEB3EUn8AxPjnnV/IiwSSzsClvHYK+sDELKN/EJ0WYg== - react-deep-force-update@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1" @@ -10658,61 +10687,36 @@ react-native-sass-transformer@^1.1.1: prop-types "^15.5.10" shaka-player "^2.4.4" -react-native@0.59.3: - version "0.59.3" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.59.3.tgz#b984bbe457f63d5515046d32ea5721fd22843548" - integrity sha512-dv3AA2rH0L0IccxRkIs4YsriaECy9ttTXrwrgwETXqmE45uVrBFRGePUFnqjcikYkkm6sS0FRxcva088un76JA== +react-native@0.60.0-rc.1: + version "0.60.0-rc.1" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.1.tgz#b75c16a8a736cbb3b4006c62db8b71947b94d146" + integrity sha512-/AHkocwlna4b2Yjsul3+R5IxLNkdjXo50cWPq1lHYOjFFsgpQ1s5bR++ILjItFj1fnpXKl804Jm3WErL7lP0+A== dependencies: "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "^1.2.1" - absolute-path "^0.0.0" + "@react-native-community/cli" "2.0.0-rc.1" + "@react-native-community/cli-platform-android" "2.0.0-rc.1" + "@react-native-community/cli-platform-ios" "2.0.0-rc.1" + abort-controller "^3.0.0" art "^0.10.0" base64-js "^1.1.2" - chalk "^2.4.1" - commander "^2.9.0" - compression "^1.7.1" connect "^3.6.5" create-react-class "^15.6.3" - debug "^2.2.0" - denodeify "^1.2.1" - errorhandler "^1.5.0" escape-string-regexp "^1.0.5" - event-target-shim "^1.0.5" + event-target-shim "^5.0.1" fbjs "^1.0.0" - fbjs-scripts "^1.0.0" - fs-extra "^1.0.0" - glob "^7.1.1" - graceful-fs "^4.1.3" - inquirer "^3.0.6" + fbjs-scripts "^1.1.0" invariant "^2.2.4" - lodash "^4.17.5" - metro-babel-register "0.51.0" - metro-react-native-babel-transformer "0.51.0" - mime "^1.3.4" - minimist "^1.2.0" - mkdirp "^0.5.1" - morgan "^1.9.0" - node-fetch "^2.2.0" - node-notifier "^5.2.1" - npmlog "^2.0.4" + jsc-android "^241213.1.0" + metro-babel-register "0.54.1" + metro-react-native-babel-transformer "0.54.1" nullthrows "^1.1.0" - opn "^3.0.2" - optimist "^0.6.1" - plist "^3.0.0" - pretty-format "24.0.0-alpha.6" + pretty-format "^24.7.0" promise "^7.1.1" - prop-types "^15.5.8" - react-clone-referenced-element "^1.0.1" + prop-types "^15.7.2" react-devtools-core "^3.6.0" - regenerator-runtime "^0.11.0" - rimraf "^2.5.4" - semver "^5.0.3" - serve-static "^1.13.1" - shell-quote "1.6.1" + regenerator-runtime "^0.13.2" stacktrace-parser "^0.1.3" - ws "^1.1.5" - xmldoc "^0.4.0" - yargs "^9.0.0" + whatwg-fetch "^3.0.0" react-proxy@^1.1.7: version "1.1.8" @@ -10763,15 +10767,15 @@ react-transform-hmr@^1.0.4: global "^4.3.0" react-proxy "^1.1.7" -react@16.8.3: - version "16.8.3" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9" - integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA== +react@16.8.6: + version "16.8.6" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" + integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.3" + scheduler "^0.13.6" react@^0.14.0: version "0.14.9" @@ -11462,6 +11466,14 @@ scheduler@^0.13.3, scheduler@^0.13.4: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.13.6: + version "0.13.6" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" + integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -11722,7 +11734,7 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" -slice-ansi@^2.1.0: +slice-ansi@^2.0.0, slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== @@ -12885,7 +12897,7 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: dependencies: iconv-lite "0.4.24" -whatwg-fetch@>=0.10.0: +whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== @@ -13244,7 +13256,7 @@ yargs@^10.0.3: y18n "^3.2.1" yargs-parser "^8.1.0" -yargs@^12.0.1, yargs@^12.0.2: +yargs@^12.0.1, yargs@^12.0.2, yargs@^12.0.5: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== From fcf8c12ed5fb666377316354764da709ab4c47ce Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 11:07:13 -0400 Subject: [PATCH 04/49] Point to react-native-video which is migrated to androidX --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b650779ec0..33e2c397f8 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.1", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#4dc15d1efcfafc4c55c1f073366235d506481a26", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index f09c26269d..6e63cfd3b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10679,9 +10679,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#4dc15d1efcfafc4c55c1f073366235d506481a26": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#4dc15d1efcfafc4c55c1f073366235d506481a26" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 5e198e3ac6e3889659dfa1ea35dd811146406b7f Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 11:51:07 -0400 Subject: [PATCH 05/49] Point to the android x migration branches on react-native-vide and react-native-recyclerview-list --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 33e2c397f8..dd6ef427f2 100644 --- a/package.json +++ b/package.json @@ -142,10 +142,10 @@ "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", - "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.1", + "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 6e63cfd3b6..c7522ecc81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10655,9 +10655,9 @@ react-native-randombytes@^3.5.1: buffer "^4.9.1" sjcl "^1.0.3" -"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.1": +"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab": version "1.0.0" - resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#80236492d0792de1c603bb10e1be6d874be5a723" + resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab" dependencies: prop-types "^15.6.0" @@ -10679,9 +10679,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#7070791feb62668c260f2c690a9c34a3143564e1" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 49225621471bf3d4a0fb8cf0f44006fedbf88afe Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 15:19:14 -0400 Subject: [PATCH 06/49] Increment jsc to version which works with RN60 Align build tools and kotlin version with WPAndroid versions --- android/app/build.gradle | 13 ++++++++----- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 3 ++- package.json | 2 +- react-native-gutenberg-bridge/android/build.gradle | 2 ++ yarn.lock | 5 ----- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0287544ac4..bddc808cfa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -135,6 +135,11 @@ android { } } } + + packagingOptions { + pickFirst '**/libjsc.so' + pickFirst '**/libc++_shared.so' + } } repositories { @@ -143,13 +148,11 @@ repositories { maven { url "https://jitpack.io" } } -configurations.all { - resolutionStrategy { - force 'org.webkit:android-jsc:r236355' - } -} dependencies { + // Make sure to put android-jsc at the the first + implementation "org.webkit:android-jsc:r241213" + implementation project(':react-native-video') implementation project(':react-native-svg') implementation project(':react-native-aztec') diff --git a/android/build.gradle b/android/build.gradle index 9137dbcd01..00832c500b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { gradlePluginVersion = '3.3.1' - kotlinVersion = '1.3.0' + kotlinVersion = '1.3.11' buildToolsVersion = "28.0.3" minSdkVersion = 21 compileSdkVersion = 28 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 019065d1d6..6e5b214208 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Jun 10 13:39:31 EDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip diff --git a/package.json b/package.json index dd6ef427f2..d421f9b327 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "jed": "^1.1.1", "jest-serializer-enzyme": "^1.0.0", "js-beautify": "^1.7.5", - "jsc-android": "236355.x.x", + "jsc-android": "^241213.1.0", "jsdom-jscore": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800", "jsx-to-string": "^1.3.1", "memize": "^1.0.5", diff --git a/react-native-gutenberg-bridge/android/build.gradle b/react-native-gutenberg-bridge/android/build.gradle index 07728eaa33..205593cfec 100644 --- a/react-native-gutenberg-bridge/android/build.gradle +++ b/react-native-gutenberg-bridge/android/build.gradle @@ -113,6 +113,8 @@ repositories { } dependencies { + // Make sure to put android-jsc at the the first + implementation "org.webkit:android-jsc:r241213" implementation project(':react-native-aztec') if (rootProject.ext.buildGutenbergFromSource) { diff --git a/yarn.lock b/yarn.lock index c7522ecc81..7846bf1991 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7827,11 +7827,6 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsc-android@236355.x.x: - version "236355.1.1" - resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-236355.1.1.tgz#43e153b722e3c60dd0595be4e7430baf65e67c9c" - integrity sha512-2py4f0McZIl/oH6AzPj1Ebutc58fyeLvwq6gyVYp1RsWr4qeLNHAPfW3kmfeVMz44oUBJMQ0lECZg9n4KBhHbQ== - jsc-android@^241213.1.0: version "241213.1.0" resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452" From a3cab39422e0900c6566b56d7e5d1cb7117f9515 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 16:42:51 -0400 Subject: [PATCH 07/49] Point to react-native-video migrate to AndroidX branch --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d421f9b327..4a33210e4c 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 7846bf1991..3ccb3bc136 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#ecf66a2d981b6c407ddd544147c38dcdb84aba38" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From cdd7e982c91b3f76181032ec6887693d6c84c37a Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 17:21:16 -0400 Subject: [PATCH 08/49] Point to the latest aztec ref --- react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle index b6d3c84bc9..c2347ef397 100644 --- a/react-native-aztec/android/build.gradle +++ b/react-native-aztec/android/build.gradle @@ -12,7 +12,7 @@ buildscript { wordpressUtilsVersion = '1.22' espressoVersion = '3.0.1' - aztecVersion = '794497db64e63a5751265f484ea07a2fa5d0b0d0' + aztecVersion = 'd5a3dfec60987a8ff0b8717bd204390b6e42d0bd' } repositories { From cc8eaed8c9a719332a224826c9612542a693284a Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 18:35:55 -0400 Subject: [PATCH 09/49] Point to the latest react-native-video ref --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4a33210e4c..2a3c33e472 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 3ccb3bc136..08a4c7668f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#7d5905c76229e71c3ec519952a5fc3572c79feb4" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 09b12556ba3fe062a13f58dc9353d08d2525fd54 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 18:54:57 -0400 Subject: [PATCH 10/49] Update react-native-video ref --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2a3c33e472..1fdf9d435a 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 08a4c7668f..6660afa968 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#5b131a79737b78b9e432ea8a42e3a217418f0388" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 957994498e37a80126269d3d49fc0b682fe17129 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 19:10:55 -0400 Subject: [PATCH 11/49] Point to latest react-native-video ref --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1fdf9d435a..0306ede795 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 6660afa968..3828ddc3dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#3b7db2c43ac3e7172faeb2e4fc728a1c81be9722" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From f9aba409dfa5017d49fb41677650fde4b5f92d14 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 19:21:24 -0400 Subject: [PATCH 12/49] Point to latest react-native-video ref --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0306ede795..c2cc7909f5 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 3828ddc3dd..160c444ed4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#a591a71d51e7521ac381e9cab83927f2111336ba" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 02708e8dc42b322b5fa18280b47147a9eb19bda9 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 11 Jun 2019 10:02:17 +0300 Subject: [PATCH 13/49] Update react-native-video ref --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2cc7909f5..9c0a3eb64f 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", From 9e268e5063c67e25dada60566c6f873e9538940a Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Tue, 11 Jun 2019 10:11:52 +0300 Subject: [PATCH 14/49] Update yarn.lock too --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 160c444ed4..4c1aec3d35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#57ad4e840ae91cbb080b142636df7534e4e95410" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From a20afa8d5ce5f7a721571ff4d9540f29d7a7e4f1 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 12 Jun 2019 16:28:13 +0300 Subject: [PATCH 15/49] Add AndroidX gradle flags to Aztec wrapper, GB bridge --- react-native-aztec/.gitignore | 1 - react-native-aztec/android/gradle.properties | 3 +++ react-native-gutenberg-bridge/android/gradle.properties | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 react-native-aztec/android/gradle.properties create mode 100644 react-native-gutenberg-bridge/android/gradle.properties diff --git a/react-native-aztec/.gitignore b/react-native-aztec/.gitignore index 2597c8ea76..80b371f149 100644 --- a/react-native-aztec/.gitignore +++ b/react-native-aztec/.gitignore @@ -32,7 +32,6 @@ local.properties # Gradle .gradle/ -gradle.properties # Generated by gradle crashlytics.properties diff --git a/react-native-aztec/android/gradle.properties b/react-native-aztec/android/gradle.properties new file mode 100644 index 0000000000..938b16188c --- /dev/null +++ b/react-native-aztec/android/gradle.properties @@ -0,0 +1,3 @@ +android.useAndroidX=true +android.enableJetifier=true + diff --git a/react-native-gutenberg-bridge/android/gradle.properties b/react-native-gutenberg-bridge/android/gradle.properties new file mode 100644 index 0000000000..938b16188c --- /dev/null +++ b/react-native-gutenberg-bridge/android/gradle.properties @@ -0,0 +1,3 @@ +android.useAndroidX=true +android.enableJetifier=true + From 0219976f2d193604f951b3a32546031d61fba8c8 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 12 Jun 2019 19:15:36 +0300 Subject: [PATCH 16/49] Update react-native-video ref --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9c0a3eb64f..7e46324c76 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 4c1aec3d35..8df65cd65d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#5a68a0033a209693485d98ed3e0e389809821ccd" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 283b79a8634094d03827dab6c5473c8e8671aad2 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 12 Jun 2019 19:25:00 +0300 Subject: [PATCH 17/49] Reverting the ExoPlayer upgrade, needs code changes --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7e46324c76..d3a8ddb91c 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/yarn.lock b/yarn.lock index 8df65cd65d..76cfe8eca8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10674,9 +10674,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#f7383da894ffc9916300417f39e0f0d1168b006c" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From e5be9f73158641f1f062f2941791c307df0d1305 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 17:34:33 -0400 Subject: [PATCH 18/49] Point to gutenberg 1.7 release --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index bc7a14bf9b..5f1fd1c29e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit bc7a14bf9b9500e8032e363ca3106d74ee860c94 +Subproject commit 5f1fd1c29e72dab7b8c4fdfcb91e72f76399ce77 From 7e5e4643827f49a0688a1e1202df0ddb78c6c2fe Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 17:42:45 -0400 Subject: [PATCH 19/49] Point to gutenberg 1.7 release --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index bc7a14bf9b..5f1fd1c29e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit bc7a14bf9b9500e8032e363ca3106d74ee860c94 +Subproject commit 5f1fd1c29e72dab7b8c4fdfcb91e72f76399ce77 From 4c513441d5290f54b08b429bb8dd4e55909c0ac5 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 17:43:16 -0400 Subject: [PATCH 20/49] Remove packaging options Removed android-jsc implementation --- android/app/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bddc808cfa..2eac154ae2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -135,11 +135,6 @@ android { } } } - - packagingOptions { - pickFirst '**/libjsc.so' - pickFirst '**/libc++_shared.so' - } } repositories { @@ -150,9 +145,6 @@ repositories { dependencies { - // Make sure to put android-jsc at the the first - implementation "org.webkit:android-jsc:r241213" - implementation project(':react-native-video') implementation project(':react-native-svg') implementation project(':react-native-aztec') From 82de3b63811a35ae9f56f3bb1018bbffddeef41f Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Sat, 15 Jun 2019 08:02:01 +1000 Subject: [PATCH 21/49] Fix Android device tests for AndroidX migration (#1125) * Proxy driver to patch accessibilityId function calls on Android * Remove geolocation from project as it's depricated --- __device-tests__/helpers/utils.js | 23 ++++++++++++++++-- __device-tests__/pages/editor-page.js | 27 +++++++++++++++------ ios/gutenberg.xcodeproj/project.pbxproj | 31 +------------------------ 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/__device-tests__/helpers/utils.js b/__device-tests__/helpers/utils.js index a076441434..cc63feeb69 100644 --- a/__device-tests__/helpers/utils.js +++ b/__device-tests__/helpers/utils.js @@ -114,9 +114,28 @@ const setupDriver = async () => { await driver.setImplicitWaitTimeout( 2000 ); await timer( 3000 ); - await driver.setOrientation( 'PORTRAIT' ); - return driver; + + // Proxy driver to patch functions on Android + // This is needed to adapt to changes in the way accessibility ids are being + // assigned after migrating to AndroidX and React Native 0.60. See: + // https://github.com/wordpress-mobile/gutenberg-mobile/pull/1112#issuecomment-501165250 + // for more details. + return new Proxy( driver, { + get: ( original, property ) => { + const propertiesToPatch = [ + 'elementByAccessibilityId', + 'hasElementByAccessibilityId', + ]; + if ( isAndroid() && ( propertiesToPatch.includes( property ) ) ) { + return async function( value, cb ) { + // Add a comma and a space to all ids + return await original[ property ]( `${ value }, `, cb ); + }; + } + return original[ property ]; + }, + } ); }; const stopDriver = async ( driver: wd.PromiseChainWebdriver ) => { diff --git a/__device-tests__/pages/editor-page.js b/__device-tests__/pages/editor-page.js index 7fb7c1f826..d63ba54f65 100644 --- a/__device-tests__/pages/editor-page.js +++ b/__device-tests__/pages/editor-page.js @@ -19,6 +19,12 @@ export default class EditorPage { paragraphBlockName = 'Paragraph'; listBlockName = 'List'; + // This is needed to adapt to changes in the way accessibility ids are being + // assigned after migrating to AndroidX and React Native 0.60. See: + // https://github.com/wordpress-mobile/gutenberg-mobile/pull/1112#issuecomment-501165250 + // for more details. + accessibilityIdSuffix = ''; + constructor( driver: wd.PromiseChainWebdriver ) { this.driver = driver; this.accessibilityIdKey = 'name'; @@ -27,6 +33,7 @@ export default class EditorPage { if ( isAndroid() ) { this.accessibilityIdXPathAttrib = 'content-desc'; this.accessibilityIdKey = 'contentDescription'; + this.accessibilityIdSuffix = ', '; } } @@ -48,7 +55,7 @@ export default class EditorPage { } async getTextViewForHtmlViewContent() { - const accessibilityId = 'html-view-content'; + const accessibilityId = `html-view-content${ this.accessibilityIdSuffix }`; let blockLocator = `//*[@${ this.accessibilityIdXPathAttrib }="${ accessibilityId }"]`; if ( ! isAndroid() ) { @@ -106,11 +113,13 @@ export default class EditorPage { if ( ! await this.hasBlockAtPosition( position, blockName ) ) { throw Error( `No Block at position ${ position }` ); } + const parentId = `${ blockName } Block. Row ${ position }.${ this.accessibilityIdSuffix }`; + const parentLocator = `//*[@${ this.accessibilityIdXPathAttrib }="${ parentId }"]`; - const parentLocator = `//*[@${ this.accessibilityIdXPathAttrib }="${ blockName } Block. Row ${ position }."]`; + const blockId = `Move block up from row ${ position } to row ${ position - 1 }${ this.accessibilityIdSuffix }`; let blockLocator = `${ parentLocator }/following-sibling::*`; blockLocator += isAndroid() ? '' : '//*'; - blockLocator += `[@${ this.accessibilityIdXPathAttrib }="Move block up from row ${ position } to row ${ position - 1 }"]`; + blockLocator += `[@${ this.accessibilityIdXPathAttrib }="${ blockId }"]`; const moveUpButton = await this.driver.elementByXPath( blockLocator ); await moveUpButton.click(); } @@ -121,10 +130,13 @@ export default class EditorPage { throw Error( `No Block at position ${ position }` ); } - const parentLocator = `//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ blockName } Block. Row ${ position }.")]`; + const parentId = `${ blockName } Block. Row ${ position }.`; + const parentLocator = `//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ parentId }")]`; + + const blockId = `Move block down from row ${ position } to row ${ position + 1 }${ this.accessibilityIdSuffix }`; let blockLocator = `${ parentLocator }/following-sibling::*`; blockLocator += isAndroid() ? '' : '//*'; - blockLocator += `[@${ this.accessibilityIdXPathAttrib }="Move block down from row ${ position } to row ${ position + 1 }"]`; + blockLocator += `[@${ this.accessibilityIdXPathAttrib }="${ blockId }"]`; const moveDownButton = await this.driver.elementByXPath( blockLocator ); await moveDownButton.click(); } @@ -136,13 +148,14 @@ export default class EditorPage { throw Error( `No Block at position ${ position }` ); } - const parentLocator = `//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ blockName } Block. Row ${ position }.")]`; + const parentId = `${ blockName } Block. Row ${ position }.`; + const parentLocator = `//*[contains(@${ this.accessibilityIdXPathAttrib }, "${ parentId }")]`; let removeBlockLocator = `${ parentLocator }/following-sibling::*`; removeBlockLocator += isAndroid() ? '' : '//*'; let removeButtonIdentifier = `Remove block at row ${ position }`; if ( isAndroid() ) { - removeButtonIdentifier += ', Double tap to remove the block'; + removeButtonIdentifier += `, Double tap to remove the block${ this.accessibilityIdSuffix }`; const block = await this.getBlockAtPosition( position, blockName ); let checkList = await this.driver.elementsByXPath( removeBlockLocator ); while ( checkList.length === 0 ) { diff --git a/ios/gutenberg.xcodeproj/project.pbxproj b/ios/gutenberg.xcodeproj/project.pbxproj index 81f5ba50a1..7de2eeb274 100644 --- a/ios/gutenberg.xcodeproj/project.pbxproj +++ b/ios/gutenberg.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; - 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; @@ -64,13 +63,6 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTActionSheet; }; - 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RCTGeolocation; - }; 00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -411,7 +403,6 @@ /* Begin PBXFileReference section */ 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = ""; }; - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = ""; }; 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; @@ -481,7 +472,6 @@ 146834051AC3E58100842450 /* libReact.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, - 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, @@ -533,14 +523,6 @@ name = Products; sourceTree = ""; }; - 00C302B61ABCB90400DB3ED1 /* Products */ = { - isa = PBXGroup; - children = ( - 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */, - ); - name = Products; - sourceTree = ""; - }; 00C302BC1ABCB91800DB3ED1 /* Products */ = { isa = PBXGroup; children = ( @@ -693,7 +675,6 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */, - 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */, 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */, 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */, @@ -938,6 +919,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -957,10 +939,6 @@ ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */; ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; }, - { - ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; - ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; - }, { ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */; ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -1036,13 +1014,6 @@ remoteRef = 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTGeolocation.a; - remoteRef = 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; From 0b3921dc9a1e5fff37d4669352438f56ab62b533 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 23:00:09 -0400 Subject: [PATCH 22/49] Revert "Point to gutenberg 1.7 release" This reverts commit e5be9f73158641f1f062f2941791c307df0d1305. --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 5f1fd1c29e..bc7a14bf9b 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 5f1fd1c29e72dab7b8c4fdfcb91e72f76399ce77 +Subproject commit bc7a14bf9b9500e8032e363ca3106d74ee860c94 From befabf9260b1c711d2d743ecb486320c23f5245e Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Tue, 18 Jun 2019 12:21:11 +0200 Subject: [PATCH 23/49] Update GB ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 1d653d1694..39d9611f6c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1d653d1694164f51c5bef67afc3bfdb25870eddd +Subproject commit 39d9611f6c333447536abff5bd162740ffb1cf5c From b0200c4249b5c92f0dbd3a5e929888525de49dbb Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 18 Jun 2019 12:31:28 -0400 Subject: [PATCH 24/49] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 39d9611f6c..8fc2f90e48 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 39d9611f6c333447536abff5bd162740ffb1cf5c +Subproject commit 8fc2f90e48c753e951ea3311c92992190ae2aff8 From 1f5c71c3ff193efce0df18804a002a19432bed41 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 20 Jun 2019 09:25:33 -0400 Subject: [PATCH 25/49] update RN to RN-60-RC2 --- gutenberg | 2 +- package.json | 2 +- yarn.lock | 53 ++++++++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/gutenberg b/gutenberg index b6ab1cf2c9..03473a9839 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b6ab1cf2c9e8e26c14a19ab4cb6d709c67c48c6a +Subproject commit 03473a9839db2e6ca3ead1068f63c93da33c8d62 diff --git a/package.json b/package.json index 9b2293d04b..09256b8081 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "node-libs-react-native": "^1.0.2", "node-sass": "^4.8.3", "react": "16.8.6", - "react-native": "0.60.0-rc.1", + "react-native": "0.60.0-rc.2", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", diff --git a/yarn.lock b/yarn.lock index 76cfe8eca8..918c98a76c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2071,36 +2071,36 @@ dependencies: core-js "^2.5.7" -"@react-native-community/cli-platform-android@2.0.0-rc.1": - version "2.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.1.tgz#9f14106104b20bd94d05a3ddad79859b566f8996" - integrity sha512-gH+ev65wxuO9KQxYTvpRh3PFCVvYwxJdZecFZDknnedIx49eVxro99svO/wcp1OLdtzxV+ErFolpIFn0gSyVFg== +"@react-native-community/cli-platform-android@2.0.0-rc.2": + version "2.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.2.tgz#78eba602aaccde906dbe8d0c48f2497900be3b3f" + integrity sha512-pZQ3W8vYqSP2hNTfhhZ2/VU2+7WVXB0dBTPU1wrNtWjxxzCYwpx6l3YM2Bjffwx5yGUJ/FpIrhKXGXZzXdAH9A== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.1" + "@react-native-community/cli-tools" "^2.0.0-rc.2" logkitty "^0.4.0" slash "^2.0.0" xmldoc "^0.4.0" -"@react-native-community/cli-platform-ios@2.0.0-rc.1": - version "2.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.1.tgz#832c8c873193b8829249227fa1d1f734e7aa267e" - integrity sha512-okioIW81pd5vA1tgdSo8nYGnljqhaV91zprrkko6IhMV4sr/eGlN0D/cyFhUXmnBj6q63+X4Ulr809wqXjJ14w== +"@react-native-community/cli-platform-ios@2.0.0-rc.2": + version "2.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.2.tgz#3c73982363b5a07a5159da9ef04c6f3e45551467" + integrity sha512-4ruii2d0ISM0IpzX8o9C/uRdw4UnUDiWDLkLzEObpNjDpOjS3jl+lFJ+S4hW6U/bldl6ahj7CJeMmXiAsTrZWQ== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.1" + "@react-native-community/cli-tools" "^2.0.0-rc.2" chalk "^1.1.1" xcode "^2.0.0" -"@react-native-community/cli-tools@^2.0.0-rc.1": - version "2.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.1.tgz#a8c3f76e0c33ab689c1c769cbbed83add5c13b11" - integrity sha512-ZUc5s/aGdg7d3dT9eMAzKqWd5Lsa42TrsUWjcqaG7WTYUPIUHTWOcpnRLV4B5MUfmEEt3mboOoQZRUcDltz8kA== +"@react-native-community/cli-tools@^2.0.0-rc.2": + version "2.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.2.tgz#4308b24de4fe0b4699c2cea687e938e7a8c62c86" + integrity sha512-B0l9k43MkLgrnZs+Z7EZ9Xmb4YYi51Ifj/pabM8EklZJPnLzjWdfvuY64NJBQf4prOg2cTXqh8s9iO/jrsgU3Q== dependencies: chalk "^1.1.1" lodash "^4.17.5" mime "^2.4.1" node-fetch "^2.5.0" -"@react-native-community/cli@2.0.0-rc.1", "@react-native-community/cli@^1.5.2": +"@react-native-community/cli@2.0.0-rc.2", "@react-native-community/cli@^1.5.2": version "1.6.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.6.0.tgz#889fbb1eff961945df28bb7e896dcee8516b010f" integrity sha512-OV3N5O/wzjb8OTZDiFerX0gf9/KzLJOvDttU38BqIvn8+OLkH6SIgGrKked9vrKKvH5bFG6jmCmKCW5gP+tOwQ== @@ -10682,15 +10682,15 @@ react-native-sass-transformer@^1.1.1: prop-types "^15.5.10" shaka-player "^2.4.4" -react-native@0.60.0-rc.1: - version "0.60.0-rc.1" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.1.tgz#b75c16a8a736cbb3b4006c62db8b71947b94d146" - integrity sha512-/AHkocwlna4b2Yjsul3+R5IxLNkdjXo50cWPq1lHYOjFFsgpQ1s5bR++ILjItFj1fnpXKl804Jm3WErL7lP0+A== +react-native@0.60.0-rc.2: + version "0.60.0-rc.2" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.2.tgz#2ebb8c0d6d0861e44e07ae6e3ab3cad8b7d9978d" + integrity sha512-o0BxbebnnUV3FC00ZAAj2i23q5z3QRmLPRKh1PinE/fn86LOGyecNsiUMAuyg94/EtGY/DSZAOj+j0eJ0VLljw== dependencies: "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "2.0.0-rc.1" - "@react-native-community/cli-platform-android" "2.0.0-rc.1" - "@react-native-community/cli-platform-ios" "2.0.0-rc.1" + "@react-native-community/cli" "2.0.0-rc.2" + "@react-native-community/cli-platform-android" "2.0.0-rc.2" + "@react-native-community/cli-platform-ios" "2.0.0-rc.2" abort-controller "^3.0.0" art "^0.10.0" base64-js "^1.1.2" @@ -10710,6 +10710,7 @@ react-native@0.60.0-rc.1: prop-types "^15.7.2" react-devtools-core "^3.6.0" regenerator-runtime "^0.13.2" + scheduler "0.14.0" stacktrace-parser "^0.1.3" whatwg-fetch "^3.0.0" @@ -11445,6 +11446,14 @@ sc-formatter@^3.0.1: resolved "https://registry.yarnpkg.com/sc-formatter/-/sc-formatter-3.0.2.tgz#9abdb14e71873ce7157714d3002477bbdb33c4e6" integrity sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A== +scheduler@0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.14.0.tgz#b392c23c9c14bfa2933d4740ad5603cc0d59ea5b" + integrity sha512-9CgbS06Kki2f4R9FjLSITjZo5BZxPsryiRNyL3LpvrM9WxcVmhlqAOc9E+KQbeI2nqej4JIIbOsfdL51cNb4Iw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler@^0.11.0: version "0.11.3" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.11.3.tgz#b5769b90cf8b1464f3f3cfcafe8e3cd7555a2d6b" From f9a71f5dbdaa61d1d00ef41a266caa33cdbe3a5c Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Fri, 21 Jun 2019 14:01:16 +0200 Subject: [PATCH 26/49] Point to latest GB master --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 3744aedfd9..284bb17814 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 3744aedfd9613a7889e28b8e436c6525e32e0648 +Subproject commit 284bb1781457941eb38a2b080d926ffdcc416e01 From 48aa34da4a1b5c3f82b8154d2ae06a18a2f9467f Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 25 Jun 2019 11:52:29 -0400 Subject: [PATCH 27/49] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index a18ba18f2a..64a8a7c520 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit a18ba18f2ac7c36310576aa3934b88434c3477bb +Subproject commit 64a8a7c5208324b5308d2298bf0f98c906cfd66f From 0d0ed24cab83753293d5d869c2161b4509c9af92 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 26 Jun 2019 11:24:51 -0400 Subject: [PATCH 28/49] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index b88bfc142b..b2690fabe7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b88bfc142bbe631cb87de0f8086804fcb4c7e973 +Subproject commit b2690fabe7cf415a926f1b5c25a0b4fead288870 From 14c952b446d91fbf24a024d09336302b66fb6b85 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Jun 2019 10:32:09 -0400 Subject: [PATCH 29/49] Update gutenberg ref Increment RN to RC-3 --- gutenberg | 2 +- package.json | 2 +- yarn.lock | 51 ++++++++++++++++++++++++++++----------------------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/gutenberg b/gutenberg index b2690fabe7..95e91cef5c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit b2690fabe7cf415a926f1b5c25a0b4fead288870 +Subproject commit 95e91cef5c04bb5c03f400b7fca79a0cab1aa4e7 diff --git a/package.json b/package.json index 81075ae2ed..2feb111db4 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "node-libs-react-native": "^1.0.2", "node-sass": "^4.8.3", "react": "16.8.6", - "react-native": "0.60.0-rc.2", + "react-native": "0.60.0-rc.3", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", diff --git a/yarn.lock b/yarn.lock index 918c98a76c..d4e800c884 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2071,36 +2071,36 @@ dependencies: core-js "^2.5.7" -"@react-native-community/cli-platform-android@2.0.0-rc.2": - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.2.tgz#78eba602aaccde906dbe8d0c48f2497900be3b3f" - integrity sha512-pZQ3W8vYqSP2hNTfhhZ2/VU2+7WVXB0dBTPU1wrNtWjxxzCYwpx6l3YM2Bjffwx5yGUJ/FpIrhKXGXZzXdAH9A== +"@react-native-community/cli-platform-android@2.0.0-rc.3": + version "2.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.3.tgz#37894a4791b0dafdbae2f70ee7a7cba4260d20d1" + integrity sha512-ZOBQZ3fTts1Hf0tnQIDJY52k4LW5IixyriaZhqCgNS25QgWUrMLrr3XBqqzO/kKA1ogirACGxar2cg0PR0F1qQ== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.2" + "@react-native-community/cli-tools" "^2.0.0-rc.3" logkitty "^0.4.0" slash "^2.0.0" xmldoc "^0.4.0" -"@react-native-community/cli-platform-ios@2.0.0-rc.2": - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.2.tgz#3c73982363b5a07a5159da9ef04c6f3e45551467" - integrity sha512-4ruii2d0ISM0IpzX8o9C/uRdw4UnUDiWDLkLzEObpNjDpOjS3jl+lFJ+S4hW6U/bldl6ahj7CJeMmXiAsTrZWQ== +"@react-native-community/cli-platform-ios@2.0.0-rc.3": + version "2.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.3.tgz#076d3e7b4d4952421877f7e3477fa07ced049b49" + integrity sha512-DOIJnqAwraBDsCCZaanZDbdTSn45ldZo0X41YMk3875HvNb9b0e9si1MI7qLSf4E+/ntyUYkJZ8CW8AYY9/9pA== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.2" + "@react-native-community/cli-tools" "^2.0.0-rc.3" chalk "^1.1.1" xcode "^2.0.0" -"@react-native-community/cli-tools@^2.0.0-rc.2": - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.2.tgz#4308b24de4fe0b4699c2cea687e938e7a8c62c86" - integrity sha512-B0l9k43MkLgrnZs+Z7EZ9Xmb4YYi51Ifj/pabM8EklZJPnLzjWdfvuY64NJBQf4prOg2cTXqh8s9iO/jrsgU3Q== +"@react-native-community/cli-tools@^2.0.0-rc.3": + version "2.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.3.tgz#4b37779081bf2e247a8865f6bd71c29adb88ed47" + integrity sha512-KG6GhmvIiLrwLGNBs3zmslnhTutm9EPwQDB3TztDU8uGn/50wPwflybS0mzT9lPzTqMcyEP7KcGtpnKqant1vA== dependencies: chalk "^1.1.1" lodash "^4.17.5" mime "^2.4.1" node-fetch "^2.5.0" -"@react-native-community/cli@2.0.0-rc.2", "@react-native-community/cli@^1.5.2": +"@react-native-community/cli@2.0.0-rc.3", "@react-native-community/cli@^1.5.2": version "1.6.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.6.0.tgz#889fbb1eff961945df28bb7e896dcee8516b010f" integrity sha512-OV3N5O/wzjb8OTZDiFerX0gf9/KzLJOvDttU38BqIvn8+OLkH6SIgGrKked9vrKKvH5bFG6jmCmKCW5gP+tOwQ== @@ -7827,6 +7827,11 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsc-android@245459.0.0: + version "245459.0.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-245459.0.0.tgz#e584258dd0b04c9159a27fb104cd5d491fd202c9" + integrity sha512-wkjURqwaB1daNkDi2OYYbsLnIdC/lUM2nPXQKRs5pqEU9chDg435bjvo+LSaHotDENygHQDHe+ntUkkw2gwMtg== + jsc-android@^241213.1.0: version "241213.1.0" resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452" @@ -10682,15 +10687,15 @@ react-native-sass-transformer@^1.1.1: prop-types "^15.5.10" shaka-player "^2.4.4" -react-native@0.60.0-rc.2: - version "0.60.0-rc.2" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.2.tgz#2ebb8c0d6d0861e44e07ae6e3ab3cad8b7d9978d" - integrity sha512-o0BxbebnnUV3FC00ZAAj2i23q5z3QRmLPRKh1PinE/fn86LOGyecNsiUMAuyg94/EtGY/DSZAOj+j0eJ0VLljw== +react-native@0.60.0-rc.3: + version "0.60.0-rc.3" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.3.tgz#03d3acaaa91ff6c37f4681cea0639067b6ac2d7b" + integrity sha512-AfA5PQJz++HjgsGFNR+nxHAWzOpihWej+vOyIUB/RcOcSJ9DQgaGWsZ27wF8RHzvrppbM+bidybiV9aN4oPM+Q== dependencies: "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "2.0.0-rc.2" - "@react-native-community/cli-platform-android" "2.0.0-rc.2" - "@react-native-community/cli-platform-ios" "2.0.0-rc.2" + "@react-native-community/cli" "2.0.0-rc.3" + "@react-native-community/cli-platform-android" "2.0.0-rc.3" + "@react-native-community/cli-platform-ios" "2.0.0-rc.3" abort-controller "^3.0.0" art "^0.10.0" base64-js "^1.1.2" @@ -10701,7 +10706,7 @@ react-native@0.60.0-rc.2: fbjs "^1.0.0" fbjs-scripts "^1.1.0" invariant "^2.2.4" - jsc-android "^241213.1.0" + jsc-android "245459.0.0" metro-babel-register "0.54.1" metro-react-native-babel-transformer "0.54.1" nullthrows "^1.1.0" From 40091e2379e9164935e29a9ec926e9cf48002597 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 1 Jul 2019 23:45:53 -0400 Subject: [PATCH 30/49] Update gb reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index a53a38bd4b..672bd9e06d 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit a53a38bd4b3d2d9b28a727f66c6b0bf37c287dd2 +Subproject commit 672bd9e06de74fec0fcddb81d083e792f800d42e From 824be03783eff42377f12e8e981c1c99525be498 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 28 Jun 2019 15:45:35 +0100 Subject: [PATCH 31/49] Use v0.60.0 patch from jtreanor/react-native --- package.json | 2 +- yarn.lock | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 8c2dc4dede..6f44af18e0 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "node-libs-react-native": "^1.0.2", "node-sass": "^4.8.3", "react": "16.8.6", - "react-native": "0.60.0-rc.3", + "react-native": "jtreanor/react-native#v0.60.0-patched", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", diff --git a/yarn.lock b/yarn.lock index d4e800c884..64a61e6538 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2071,36 +2071,36 @@ dependencies: core-js "^2.5.7" -"@react-native-community/cli-platform-android@2.0.0-rc.3": - version "2.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.0-rc.3.tgz#37894a4791b0dafdbae2f70ee7a7cba4260d20d1" - integrity sha512-ZOBQZ3fTts1Hf0tnQIDJY52k4LW5IixyriaZhqCgNS25QgWUrMLrr3XBqqzO/kKA1ogirACGxar2cg0PR0F1qQ== +"@react-native-community/cli-platform-android@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.0.1.tgz#5a334034adb1cb949deffc310fd555ffe4255812" + integrity sha512-N7PbX6WUCDrOeZjMqukjiktelmu3JFgBcvREU31mkgV8gmJWj+W2CwfT5Gi1iVhTrSbgeWrfcQa3dIGE4DDBmg== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.3" + "@react-native-community/cli-tools" "^2.0.1" logkitty "^0.4.0" slash "^2.0.0" xmldoc "^0.4.0" -"@react-native-community/cli-platform-ios@2.0.0-rc.3": - version "2.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.0-rc.3.tgz#076d3e7b4d4952421877f7e3477fa07ced049b49" - integrity sha512-DOIJnqAwraBDsCCZaanZDbdTSn45ldZo0X41YMk3875HvNb9b0e9si1MI7qLSf4E+/ntyUYkJZ8CW8AYY9/9pA== +"@react-native-community/cli-platform-ios@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.0.1.tgz#3a1ca6f3b785036e12963aba159fc4ee4a184319" + integrity sha512-UphukMmwqI5ekQjQzspeqkAbfbh+lcwqtHyH0K1r5wp+XS8V2wjuz5txCXZ0vVwAHh37O1PRt/JsSfMSXoSpSA== dependencies: - "@react-native-community/cli-tools" "^2.0.0-rc.3" + "@react-native-community/cli-tools" "^2.0.1" chalk "^1.1.1" xcode "^2.0.0" -"@react-native-community/cli-tools@^2.0.0-rc.3": - version "2.0.0-rc.3" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.0-rc.3.tgz#4b37779081bf2e247a8865f6bd71c29adb88ed47" - integrity sha512-KG6GhmvIiLrwLGNBs3zmslnhTutm9EPwQDB3TztDU8uGn/50wPwflybS0mzT9lPzTqMcyEP7KcGtpnKqant1vA== +"@react-native-community/cli-tools@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-2.0.1.tgz#04609786c5afad2bb17f5f280894ce62a1b3c97c" + integrity sha512-cy1yFelZCdjXMWG214HOUgBP/9JdMFO60Cjrshr3R2QOcIL2ASGePPK2YksDPcFYknL327isuOTFPmvti7cslA== dependencies: chalk "^1.1.1" lodash "^4.17.5" mime "^2.4.1" node-fetch "^2.5.0" -"@react-native-community/cli@2.0.0-rc.3", "@react-native-community/cli@^1.5.2": +"@react-native-community/cli@^1.5.2", "@react-native-community/cli@^2.0.1": version "1.6.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.6.0.tgz#889fbb1eff961945df28bb7e896dcee8516b010f" integrity sha512-OV3N5O/wzjb8OTZDiFerX0gf9/KzLJOvDttU38BqIvn8+OLkH6SIgGrKked9vrKKvH5bFG6jmCmKCW5gP+tOwQ== @@ -10687,15 +10687,14 @@ react-native-sass-transformer@^1.1.1: prop-types "^15.5.10" shaka-player "^2.4.4" -react-native@0.60.0-rc.3: - version "0.60.0-rc.3" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.3.tgz#03d3acaaa91ff6c37f4681cea0639067b6ac2d7b" - integrity sha512-AfA5PQJz++HjgsGFNR+nxHAWzOpihWej+vOyIUB/RcOcSJ9DQgaGWsZ27wF8RHzvrppbM+bidybiV9aN4oPM+Q== +react-native@jtreanor/react-native#v0.60.0-patched: + version "0.60.0-patched" + resolved "https://codeload.github.com/jtreanor/react-native/tar.gz/13f273726a57761ae3ee956f876fe94b92074d44" dependencies: "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "2.0.0-rc.3" - "@react-native-community/cli-platform-android" "2.0.0-rc.3" - "@react-native-community/cli-platform-ios" "2.0.0-rc.3" + "@react-native-community/cli" "^2.0.1" + "@react-native-community/cli-platform-android" "^2.0.1" + "@react-native-community/cli-platform-ios" "^2.0.1" abort-controller "^3.0.0" art "^0.10.0" base64-js "^1.1.2" From 93cfefaa9548493cd58647cdd0f8018c2408339b Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 28 Jun 2019 15:58:02 +0100 Subject: [PATCH 32/49] Update bin/generate-podspecs.sh for new RN CocoaPods integration --- bin/generate-podspecs.sh | 46 ++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/bin/generate-podspecs.sh b/bin/generate-podspecs.sh index 7d399477a3..30b0139d21 100755 --- a/bin/generate-podspecs.sh +++ b/bin/generate-podspecs.sh @@ -7,23 +7,41 @@ set -e cd "$( dirname $0 )" cd .. -# Check for cocoapods +# Check for cocoapods & jq command -v pod > /dev/null || ( echo Cocoapods is required to generate podspecs; exit 1 ) +command -v jq > /dev/null || ( echo jq is required to generate podspecs; exit 1 ) -PODSPECS=$(cat < "$TMP_DEST/$pod.podspec.json" + cat "$TMP_DEST/$pod.podspec.json" | jq > "$DEST/$pod.podspec.json" + + # Add a "prepare_command" entry to each podspec so that 'pod install' will fetch sources from the correct directory + # and retains the existing prepare_command if it exists + prepare_command="TMP_DIR=\$(mktemp -d); mv * \$TMP_DIR; cp -R \"\$TMP_DIR/${path}\"/* ." + cat "$TMP_DEST/$pod.podspec.json" | jq --arg CMD "$prepare_command" '.prepare_command = "\($CMD) && \(.prepare_command // true)" + # Point to React Native fork. To be removed once https://github.com/facebook/react-native/issues/25349 is closed + | .source.git = "https://github.com/jtreanor/react-native.git"' > "$DEST/$pod.podspec.json" +done + +for podspec in $EXTERNAL_PODSPECS do - pod=`basename $podspec .podspec` + pod=$(basename "$podspec" .podspec) + echo "Generating podspec for $pod" - INSTALL_YOGA_WITHOUT_PATH_OPTION=1 pod ipc spec $podspec > "$DEST/$pod.podspec.json" -done \ No newline at end of file + pod ipc spec $podspec > "$DEST/$pod.podspec.json" +done From 595cc40eecfb06da81066452dc850f8e6b834136 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 28 Jun 2019 16:01:23 +0100 Subject: [PATCH 33/49] Generated podspecs for v0.60.0-patched --- .../DoubleConversion.podspec.json | 2 + .../third-party-podspecs/Folly.podspec.json | 29 +- .../React-ART.podspec.json | 29 + .../React-Core.podspec.json | 72 +++ .../React-DevSupport.podspec.json | 33 + .../React-Fabric.podspec.json | 318 ++++++++++ .../React-RCTActionSheet.podspec.json | 30 + .../React-RCTAnimation.podspec.json | 29 + .../React-RCTBlob.podspec.json | 38 ++ .../React-RCTCameraRoll.podspec.json | 33 + .../React-RCTFabric.podspec.json | 48 ++ .../React-RCTImage.podspec.json | 33 + .../React-RCTLinking.podspec.json | 30 + .../React-RCTNetwork.podspec.json | 29 + .../React-RCTPushNotification.podspec.json | 30 + .../React-RCTSettings.podspec.json | 30 + .../React-RCTTest.podspec.json | 30 + .../React-RCTText.podspec.json | 30 + .../React-RCTVibration.podspec.json | 30 + .../React-RCTWebSocket.podspec.json | 30 + .../React-cxxreact.podspec.json | 37 ++ .../React-graphics.podspec.json | 34 + .../React-jscallinvoker.podspec.json | 31 + .../React-jsi.podspec.json | 46 ++ .../React-jsiexecutor.podspec.json | 36 ++ .../React-jsinspector.podspec.json | 19 + .../React-turbomodule-core.podspec.json | 49 ++ .../React-turbomodule-samples.podspec.json | 52 ++ .../third-party-podspecs/React.podspec.json | 591 ++---------------- .../third-party-podspecs/glog.podspec.json | 1 + .../third-party-podspecs/yoga.podspec.json | 15 +- 31 files changed, 1288 insertions(+), 556 deletions(-) create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-ART.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-Fabric.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTCameraRoll.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTFabric.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTPushNotification.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTTest.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-graphics.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-jscallinvoker.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-core.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-samples.podspec.json diff --git a/react-native-gutenberg-bridge/third-party-podspecs/DoubleConversion.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/DoubleConversion.podspec.json index 6e7c717e57..2ef9fcfbae 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/DoubleConversion.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/DoubleConversion.podspec.json @@ -13,7 +13,9 @@ "tag": "v1.1.6" }, "module_name": "DoubleConversion", + "header_dir": "double-conversion", "source_files": "double-conversion/*.{h,cc}", + "compiler_flags": "-Wno-unreachable-code", "platforms": { "ios": "9.0", "tvos": "9.2" diff --git a/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json index bafafbe515..2b38f932ed 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json @@ -23,7 +23,7 @@ ] }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", "source_files": [ "folly/String.cpp", "folly/Conv.cpp", @@ -59,8 +59,33 @@ "CLANG_CXX_LANGUAGE_STANDARD": "c++14", "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" }, + "default_subspecs": "Default", "platforms": { "ios": "9.0", "tvos": "9.2" - } + }, + "subspecs": [ + { + "name": "Default" + }, + { + "name": "Fabric", + "source_files": [ + "folly/portability/SysUio.cpp", + "folly/FileUtil.cpp", + "folly/SharedMutex.cpp", + "folly/concurrency/CacheLocality.cpp", + "folly/detail/Futex.cpp", + "folly/lang/SafeAssert.cpp", + "folly/synchronization/ParkingLot.cpp", + "folly/portability/Malloc.cpp" + ], + "preserve_paths": [ + "folly/concurrency/CacheLocality.h", + "folly/synchronization/ParkingLot.h", + "folly/synchronization/SanitizeThread.h", + "folly/system/ThreadId.h" + ] + } + ] } diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-ART.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-ART.podspec.json new file mode 100644 index 0000000000..6a7ac69a81 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-ART.podspec.json @@ -0,0 +1,29 @@ +{ + "name": "React-ART", + "version": "0.60.0-patched", + "summary": "A library for drawing vector graphics.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "**/*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "ART", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/ART\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json new file mode 100644 index 0000000000..580a9fea3c --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json @@ -0,0 +1,72 @@ +{ + "name": "React-Core", + "version": "0.60.0-patched", + "summary": "The core of React Native.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "**/*.{c,h,m,mm,S,cpp}", + "exclude_files": [ + "DevSupport/**/*", + "Fabric/**/*", + "Inspector/**/*" + ], + "ios": { + "exclude_files": "**/RCTTV*.*" + }, + "tvos": { + "exclude_files": [ + "Modules/RCTClipboard*", + "Views/RCTDatePicker*", + "Views/RCTPicker*", + "Views/RCTRefreshControl*", + "Views/RCTSlider*", + "Views/RCTSwitch*" + ] + }, + "private_header_files": "Cxx*/*.h", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "header_dir": "React", + "frameworks": "JavaScriptCore", + "libraries": "stdc++", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" + }, + "default_subspecs": "Default", + "dependencies": { + "Folly": [ + "2018.10.22.00" + ], + "React-cxxreact": [ + "0.60.0-patched" + ], + "React-jsi": [ + "0.60.0-patched" + ], + "React-jsiexecutor": [ + "0.60.0-patched" + ], + "yoga": [ + "0.60.0-patched.React" + ], + "glog": [] + }, + "subspecs": [ + { + "name": "Default" + }, + { + "name": "CxxBridge", + "public_header_files": "**/*.{h}" + } + ], + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/React\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json new file mode 100644 index 0000000000..09cd219cd0 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json @@ -0,0 +1,33 @@ +{ + "name": "React-DevSupport", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": [ + "DevSupport/*", + "Inspector/*" + ], + "header_dir": "DevSupport", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-jsinspector": [ + "0.60.0-patched" + ], + "React-RCTWebSocket": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/React\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-Fabric.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-Fabric.podspec.json new file mode 100644 index 0000000000..c67fddca8a --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-Fabric.podspec.json @@ -0,0 +1,318 @@ +{ + "name": "React-Fabric", + "version": "0.60.0-patched", + "summary": "Fabric for React Native.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon\"/* . && #!/bin/bash\n# Copyright (c) Facebook, Inc. and its affiliates.\n#\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n#\n# This script collects the \"core\" component schemas used by fabric\n# then uses react-native-codegen to generate the component headers\n# to a location that the podspecs expect.\n\n# shellcheck disable=SC2038\nfind \"$PWD/../Libraries\" -name \"*Schema.js\" -print | xargs yarn flow-node packages/react-native-codegen/buck_tests/combine-js-to-schema-cli.js schema-rncore.json\nyarn flow-node packages/react-native-codegen/buck_tests/generate-tests.js schema-rncore.json rncore ReactCommon/fabric/components/rncore", + "source_files": "dummyFile.cpp", + "libraries": "stdc++", + "pod_target_xcconfig": { + "USE_HEADERMAP": "YES", + "CLANG_CXX_LANGUAGE_STANDARD": "c++14" + }, + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ], + "React-graphics": [ + "0.60.0-patched" + ], + "React-jsiexecutor": [ + "0.60.0-patched" + ] + }, + "subspecs": [ + { + "name": "attributedstring", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/attributedstring/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/attributedstring", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "better", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "better/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "better", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "config", + "source_files": "config/*.{m,mm,cpp,h}", + "header_dir": "react/config", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" + } + }, + { + "name": "core", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "source_files": "fabric/core/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/core", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "components", + "subspecs": [ + { + "name": "activityindicator", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/activityindicator/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/activityindicator", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "image", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/image/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/image", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "rncore", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/rncore/*.{m,mm,cpp,h}", + "exclude_files": [ + "**/tests/*", + "fabric/components/rncore/*Tests.{h,cpp}" + ], + "header_dir": "react/components/rncore", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "root", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/root/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/root", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "scrollview", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/scrollview/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/scrollview", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "slider", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/slider/**/*.{m,mm,cpp,h}", + "exclude_files": [ + "**/tests/*", + "**/android/*" + ], + "header_dir": "react/components/slider", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "text", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/text/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/text", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "view", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ], + "yoga": [ + "0.60.0-patched.React" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/components/view/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/components/view", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + } + ] + }, + { + "name": "debug", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/debug/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/debug", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "imagemanager", + "dependencies": { + "React-RCTImage": [ + "0.60.0-patched" + ], + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/imagemanager/**/*.{m,mm,cpp,h}", + "exclude_files": [ + "**/tests/*", + "**/android/*" + ], + "header_dir": "react/imagemanager", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "mounting", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/mounting/**/*.{m,mm,cpp,h}", + "exclude_files": "**/tests/*", + "header_dir": "react/mounting", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "textlayoutmanager", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/textlayoutmanager/**/*.{m,mm,cpp,h}", + "exclude_files": [ + "**/tests/*", + "**/android/*" + ], + "header_dir": "react/textlayoutmanager", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "uimanager", + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "fabric/uimanager/**/*.{m,mm,cpp,h}", + "header_dir": "react/uimanager", + "exclude_files": [ + "**/tests/*", + "react/uimanager" + ], + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + }, + { + "name": "utils", + "source_files": "utils/*.{m,mm,cpp,h}", + "header_dir": "react/utils", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + } + } + ] +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json new file mode 100644 index 0000000000..7a6d5de29e --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTActionSheet", + "version": "0.60.0-patched", + "summary": "An API for displaying iOS action sheets and share sheets.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/actionsheetios", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTActionSheet", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/ActionSheetIOS\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json new file mode 100644 index 0000000000..f2ced802ba --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json @@ -0,0 +1,29 @@ +{ + "name": "React-RCTAnimation", + "version": "0.60.0-patched", + "summary": "A native driver for the Animated API.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "{Drivers/*,Nodes/*,*}.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTAnimation", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/NativeAnimation\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json new file mode 100644 index 0000000000..cc93bc0c54 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json @@ -0,0 +1,38 @@ +{ + "name": "React-RCTBlob", + "version": "0.60.0-patched", + "summary": "An API for displaying iOS action sheets and share sheets.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m,mm}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTBlob", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-jsi": [ + "0.60.0-patched" + ], + "React-RCTNetwork": [ + "0.60.0-patched" + ], + "React-RCTWebSocket": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Blob\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTCameraRoll.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTCameraRoll.podspec.json new file mode 100644 index 0000000000..1a51851823 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTCameraRoll.podspec.json @@ -0,0 +1,33 @@ +{ + "name": "React-RCTCameraRoll", + "version": "0.60.0-patched", + "summary": "An API that provides access to the local camera roll or photo library.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/cameraroll", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "React", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-RCTImage": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/CameraRoll\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTFabric.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTFabric.podspec.json new file mode 100644 index 0000000000..cdc5b31027 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTFabric.podspec.json @@ -0,0 +1,48 @@ +{ + "name": "React-RCTFabric", + "version": "0.60.0-patched", + "summary": "RCTFabric for React Native.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "Fabric/**/*.{c,h,m,mm,S,cpp}", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "exclude_files": [ + "**/tests/*", + "**/android/*", + "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation" + ], + "header_dir": "React", + "frameworks": "JavaScriptCore", + "libraries": "stdc++", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" + }, + "xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/Folly\"", + "OTHER_CFLAGS": "$(inherited) -DRN_FABRIC_ENABLED -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1" + }, + "dependencies": { + "React-Core/CxxBridge": [ + "0.60.0-patched" + ], + "React-Fabric": [ + "0.60.0-patched" + ], + "React-RCTImage": [ + "0.60.0-patched" + ], + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/React\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json new file mode 100644 index 0000000000..a747ca1be8 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json @@ -0,0 +1,33 @@ +{ + "name": "React-RCTImage", + "version": "0.60.0-patched", + "summary": "A React component for displaying different types of images.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/image", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTImage", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-RCTNetwork": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Image\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json new file mode 100644 index 0000000000..cb49c2224c --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTLinking", + "version": "0.60.0-patched", + "summary": "A general interface to interact with both incoming and outgoing app links.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/linking", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTLinking", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/LinkingIOS\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json new file mode 100644 index 0000000000..c0c74d77b2 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json @@ -0,0 +1,29 @@ +{ + "name": "React-RCTNetwork", + "version": "0.60.0-patched", + "summary": "The networking library of React Native.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m,mm}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTNetwork", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Network\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTPushNotification.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTPushNotification.podspec.json new file mode 100644 index 0000000000..fa8e71feff --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTPushNotification.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTPushNotification", + "version": "0.60.0-patched", + "summary": "A library for handling push notifications for your app, including permission handling and icon badge number.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/pushnotificationios", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTPushNotification", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/PushNotificationIOS\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json new file mode 100644 index 0000000000..1644df4cb1 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTSettings", + "version": "0.60.0-patched", + "summary": "A wrapper for NSUserDefaults, a persistent key-value store available only on iOS.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/settings", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTSettings", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Settings\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTTest.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTTest.podspec.json new file mode 100644 index 0000000000..b7a87c812d --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTTest.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTTest", + "version": "0.60.0-patched", + "summary": "Tools for integration and snapshot testing.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "**/*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "frameworks": "XCTest", + "header_dir": "RCTTest", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/RNTester/RCTTest\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json new file mode 100644 index 0000000000..bb11ba6909 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTText", + "version": "0.60.0-patched", + "summary": "A React component for displaying text.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/text", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "**/*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTText", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Text\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json new file mode 100644 index 0000000000..6b1db8e50b --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTVibration", + "version": "0.60.0-patched", + "summary": "An API for controlling the vibration hardware of the device.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/vibration", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTVibration", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/Vibration\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json new file mode 100644 index 0000000000..ac40938896 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json @@ -0,0 +1,30 @@ +{ + "name": "React-RCTWebSocket", + "version": "0.60.0-patched", + "summary": "A library for supporting WebSockets, a protocol which provides full-duplex communication channels over a single TCP connection.", + "homepage": "http://facebook.github.io/react-native/", + "documentation_url": "https://facebook.github.io/react-native/docs/network#websocket-support", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{h,m}", + "preserve_paths": [ + "package.json", + "LICENSE", + "LICENSE-docs" + ], + "header_dir": "RCTWebSocket", + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/Libraries/WebSocket\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json new file mode 100644 index 0000000000..975e7e1f11 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json @@ -0,0 +1,37 @@ +{ + "name": "React-cxxreact", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{cpp,h}", + "exclude_files": "SampleCxxModule.*", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "header_dir": "cxxreact", + "dependencies": { + "boost-for-react-native": [ + "1.63.0" + ], + "DoubleConversion": [], + "Folly": [ + "2018.10.22.00" + ], + "glog": [], + "React-jsinspector": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/cxxreact\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-graphics.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-graphics.podspec.json new file mode 100644 index 0000000000..94648bea6c --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-graphics.podspec.json @@ -0,0 +1,34 @@ +{ + "name": "React-graphics", + "version": "0.60.0-patched", + "summary": "Fabric for React Native.", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "libraries": "stdc++", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32", + "source_files": "**/*.{m,mm,cpp,h}", + "exclude_files": [ + "**/tests/*", + "**/android/*" + ], + "header_dir": "react/graphics", + "pod_target_xcconfig": { + "USE_HEADERMAP": "NO", + "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" + }, + "dependencies": { + "Folly/Fabric": [ + "2018.10.22.00" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/fabric/graphics\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-jscallinvoker.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-jscallinvoker.podspec.json new file mode 100644 index 0000000000..1e364ff37e --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-jscallinvoker.podspec.json @@ -0,0 +1,31 @@ +{ + "name": "React-jscallinvoker", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "jsireact/*.{cpp,h}", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "header_dir": "jscallinvoker", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "dependencies": { + "React-cxxreact": [ + "0.60.0-patched" + ], + "Folly": [ + "2018.10.22.00" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/jscallinvoker\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json new file mode 100644 index 0000000000..0987e60aec --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json @@ -0,0 +1,46 @@ +{ + "name": "React-jsi", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "**/*.{cpp,h}", + "frameworks": "JavaScriptCore", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "header_dir": "jsi", + "default_subspecs": "Default", + "dependencies": { + "boost-for-react-native": [ + "1.63.0" + ], + "DoubleConversion": [], + "Folly": [ + "2018.10.22.00" + ], + "glog": [] + }, + "subspecs": [ + { + "name": "Default" + }, + { + "name": "Fabric", + "pod_target_xcconfig": { + "OTHER_CFLAGS": "$(inherited) -DRN_FABRIC_ENABLED" + } + } + ], + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/jsi\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json new file mode 100644 index 0000000000..4f518d2391 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json @@ -0,0 +1,36 @@ +{ + "name": "React-jsiexecutor", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "jsireact/*.{cpp,h}", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "header_dir": "jsireact", + "dependencies": { + "React-cxxreact": [ + "0.60.0-patched" + ], + "React-jsi": [ + "0.60.0-patched" + ], + "Folly": [ + "2018.10.22.00" + ], + "DoubleConversion": [], + "glog": [] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/jsiexecutor\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json new file mode 100644 index 0000000000..e244b49ca7 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json @@ -0,0 +1,19 @@ +{ + "name": "React-jsinspector", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{cpp,h}", + "header_dir": "jsinspector", + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/jsinspector\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-core.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-core.podspec.json new file mode 100644 index 0000000000..ac50801df5 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-core.podspec.json @@ -0,0 +1,49 @@ +{ + "name": "React-turbomodule-core", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{cpp,h}", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "header_dir": "turbomodule", + "xcconfig": { + "OTHER_CFLAGS": "$(inherited) -DRN_TURBO_MODULE_ENABLED" + }, + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-cxxreact": [ + "0.60.0-patched" + ], + "React-jsi": [ + "0.60.0-patched" + ], + "Folly": [ + "2018.10.22.00" + ], + "React-jscallinvoker": [ + "0.60.0-patched" + ] + }, + "subspecs": [ + { + "name": "core-ios", + "source_files": "platform/ios/*.{mm,cpp,h}" + } + ], + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/turbomodule/core\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-samples.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-samples.podspec.json new file mode 100644 index 0000000000..6abbaa45c8 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/React-turbomodule-samples.podspec.json @@ -0,0 +1,52 @@ +{ + "name": "React-turbomodule-samples", + "version": "0.60.0-patched", + "summary": "-", + "homepage": "http://facebook.github.io/react-native/", + "license": "MIT", + "authors": "Facebook, Inc. and its affiliates", + "platforms": { + "ios": "9.0", + "tvos": "9.2" + }, + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" + }, + "source_files": "*.{cpp,h}", + "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation", + "pod_target_xcconfig": { + "HEADER_SEARCH_PATHS": "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" + }, + "header_dir": "turbomodule-samples", + "xcconfig": { + "OTHER_CFLAGS": "$(inherited) -DRN_TURBO_MODULE_ENABLED" + }, + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-cxxreact": [ + "0.60.0-patched" + ], + "React-jsi": [ + "0.60.0-patched" + ], + "React-turbomodule-core": [ + "0.60.0-patched" + ], + "Folly": [ + "2018.10.22.00" + ], + "DoubleConversion": [], + "glog": [] + }, + "subspecs": [ + { + "name": "samples-ios", + "source_files": "platform/ios/*.{mm,cpp,h}", + "header_dir": "turbomodule-samples" + } + ], + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/turbomodule/samples\"/* . && true" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json index d82e6528e7..a31e88d59c 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json @@ -1,23 +1,18 @@ { "name": "React", - "version": "0.59.3", + "version": "0.60.0-patched", "summary": "A framework for building native apps using React", "description": "React Native apps are built using the React JS\nframework, and render directly to native UIKit\nelements using a fully asynchronous architecture.\nThere is no browser and no HTML. We have picked what\nwe think is the best set of features from these and\nother technologies to build what we hope to become\nthe best product development framework available,\nwith an emphasis on iteration speed, developer\ndelight, continuity of technology, and absolutely\nbeautiful and fast products with no compromises in\nquality or capability.", "homepage": "http://facebook.github.io/react-native/", "license": "MIT", - "authors": "Facebook", - "source": { - "git": "https://github.com/facebook/react-native.git", - "tag": "v0.59.3" - }, - "default_subspecs": "Core", - "requires_arc": true, + "authors": "Facebook, Inc. and its affiliates", "platforms": { "ios": "9.0", "tvos": "9.2" }, - "pod_target_xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++14" + "source": { + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" }, "preserve_paths": [ "package.json", @@ -25,541 +20,43 @@ "LICENSE-docs" ], "cocoapods_version": ">= 1.2.0", - "subspecs": [ - { - "name": "Core", - "dependencies": { - "yoga": [ - "0.59.3.React" - ] - }, - "source_files": "React/**/*.{c,h,m,mm,S,cpp}", - "exclude_files": [ - "**/__tests__/*", - "IntegrationTests/*", - "React/DevSupport/*", - "React/Inspector/*", - "ReactCommon/yoga/*", - "React/Cxx*/*", - "React/Fabric/**/*" - ], - "ios": { - "exclude_files": "React/**/RCTTV*.*" - }, - "tvos": { - "exclude_files": [ - "React/Modules/RCTClipboard*", - "React/Views/RCTDatePicker*", - "React/Views/RCTPicker*", - "React/Views/RCTRefreshControl*", - "React/Views/RCTSlider*", - "React/Views/RCTSwitch*", - "React/Views/RCTWebView*" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "header_dir": "React", - "frameworks": "JavaScriptCore", - "libraries": "stdc++", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" - } - }, - { - "name": "CxxBridge", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ], - "React/Core": [ - - ], - "React/cxxreact": [ - - ], - "React/jsiexecutor": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "private_header_files": "React/Cxx*/*.h", - "source_files": "React/Cxx*/*.{h,m,mm}" - }, - { - "name": "DevSupport", - "dependencies": { - "React/Core": [ - - ], - "React/RCTWebSocket": [ - - ] - }, - "source_files": [ - "React/DevSupport/*", - "React/Inspector/*" - ] - }, - { - "name": "RCTFabric", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ], - "React/Core": [ - - ], - "React/fabric": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "React/Fabric/**/*.{c,h,m,mm,S,cpp}", - "exclude_files": "**/tests/*", - "header_dir": "React", - "frameworks": "JavaScriptCore", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" - } - }, - { - "name": "tvOS", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "React/**/RCTTV*.{h,m}" - }, - { - "name": "jsinspector", - "source_files": "ReactCommon/jsinspector/*.{cpp,h}", - "private_header_files": "ReactCommon/jsinspector/*.h", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" - } - }, - { - "name": "jsiexecutor", - "dependencies": { - "React/cxxreact": [ - - ], - "React/jsi": [ - - ], - "Folly": [ - "2018.10.22.00" - ], - "DoubleConversion": [ - - ], - "glog": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/jsiexecutor/jsireact/*.{cpp,h}", - "private_header_files": "ReactCommon/jsiexecutor/jsireact/*.h", - "header_dir": "jsireact", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\", \"$(PODS_TARGET_SRCROOT)/ReactCommon/jsiexecutor\"" - } - }, - { - "name": "jsi", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ], - "DoubleConversion": [ - - ], - "glog": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/jsi/*.{cpp,h}", - "private_header_files": "ReactCommon/jsi/*.h", - "frameworks": "JavaScriptCore", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" - } - }, - { - "name": "PrivateDatabase", - "source_files": "ReactCommon/privatedata/*.{cpp,h}", - "private_header_files": "ReactCommon/privatedata/*.h", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" - } - }, - { - "name": "cxxreact", - "dependencies": { - "React/jsinspector": [ - - ], - "boost-for-react-native": [ - "1.63.0" - ], - "Folly": [ - "2018.10.22.00" - ], - "DoubleConversion": [ - - ], - "glog": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/cxxreact/*.{cpp,h}", - "exclude_files": "ReactCommon/cxxreact/SampleCxxModule.*", - "private_header_files": "ReactCommon/cxxreact/*.h", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "fabric", - "subspecs": [ - { - "name": "activityindicator", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/activityindicator/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/activityindicator", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "attributedstring", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/attributedstring/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/attributedstring", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "core", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/core/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/core", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "debug", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/debug/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/debug", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "graphics", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/graphics/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/graphics", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "scrollview", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/scrollview/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/scrollview", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "text", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/text/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/text", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "textlayoutmanager", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/textlayoutmanager/**/*.{cpp,h,mm}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/textlayoutmanager", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "uimanager", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/uimanager/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/uimanager", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "view", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ], - "yoga": [ - - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/view/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/view", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - } - ] - }, - { - "name": "RCTFabricSample", - "dependencies": { - "Folly": [ - "2018.10.22.00" - ] - }, - "compiler_flags": "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1", - "source_files": "ReactCommon/fabric/sample/**/*.{cpp,h}", - "exclude_files": "**/tests/*", - "header_dir": "fabric/sample", - "pod_target_xcconfig": { - "HEADER_SEARCH_PATHS": "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" - } - }, - { - "name": "ART", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/ART/**/*.{h,m}" - }, - { - "name": "RCTActionSheet", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/ActionSheetIOS/*.{h,m}" - }, - { - "name": "RCTAnimation", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/NativeAnimation/{Drivers/*,Nodes/*,*}.{h,m}", - "header_dir": "RCTAnimation" - }, - { - "name": "RCTBlob", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Blob/*.{h,m,mm}", - "preserve_paths": "Libraries/Blob/*.js" - }, - { - "name": "RCTCameraRoll", - "dependencies": { - "React/Core": [ - - ], - "React/RCTImage": [ - - ] - }, - "source_files": "Libraries/CameraRoll/*.{h,m}" - }, - { - "name": "RCTGeolocation", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Geolocation/*.{h,m}" - }, - { - "name": "RCTImage", - "dependencies": { - "React/Core": [ - - ], - "React/RCTNetwork": [ - - ] - }, - "source_files": "Libraries/Image/*.{h,m}" - }, - { - "name": "RCTNetwork", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Network/*.{h,m,mm}" - }, - { - "name": "RCTPushNotification", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/PushNotificationIOS/*.{h,m}" - }, - { - "name": "RCTSettings", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Settings/*.{h,m}" - }, - { - "name": "RCTText", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Text/**/*.{h,m}" - }, - { - "name": "RCTVibration", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/Vibration/*.{h,m}" - }, - { - "name": "RCTWebSocket", - "dependencies": { - "React/Core": [ - - ], - "React/RCTBlob": [ - - ], - "React/fishhook": [ - - ] - }, - "source_files": "Libraries/WebSocket/*.{h,m}" - }, - { - "name": "fishhook", - "header_dir": "fishhook", - "source_files": "Libraries/fishhook/*.{h,c}" - }, - { - "name": "RCTLinkingIOS", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/LinkingIOS/*.{h,m}" - }, - { - "name": "RCTTest", - "dependencies": { - "React/Core": [ - - ] - }, - "source_files": "Libraries/RCTTest/**/*.{h,m}", - "frameworks": "XCTest" - }, - { - "name": "_ignore_me_subspec_for_linting_", - "dependencies": { - "React/Core": [ - - ], - "React/CxxBridge": [ - - ] - } - } - ] + "dependencies": { + "React-Core": [ + "0.60.0-patched" + ], + "React-DevSupport": [ + "0.60.0-patched" + ], + "React-RCTActionSheet": [ + "0.60.0-patched" + ], + "React-RCTAnimation": [ + "0.60.0-patched" + ], + "React-RCTBlob": [ + "0.60.0-patched" + ], + "React-RCTImage": [ + "0.60.0-patched" + ], + "React-RCTLinking": [ + "0.60.0-patched" + ], + "React-RCTNetwork": [ + "0.60.0-patched" + ], + "React-RCTSettings": [ + "0.60.0-patched" + ], + "React-RCTText": [ + "0.60.0-patched" + ], + "React-RCTVibration": [ + "0.60.0-patched" + ], + "React-RCTWebSocket": [ + "0.60.0-patched" + ] + }, + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/.\"/* . && true" } diff --git a/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json index e7609e56e8..8c68967faf 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json @@ -31,6 +31,7 @@ ], "exclude_files": "src/windows/**/*", "libraries": "stdc++", + "compiler_flags": "-Wno-shorten-64-to-32", "pod_target_xcconfig": { "USE_HEADERMAP": "NO", "HEADER_SEARCH_PATHS": "$(PODS_TARGET_SRCROOT)/src" diff --git a/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json index d2cc6f6816..fd0fcef390 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json @@ -1,17 +1,17 @@ { "name": "yoga", - "version": "0.59.3.React", + "version": "0.60.0-patched.React", "license": { "type": "MIT" }, - "homepage": "https://facebook.github.io/yoga/", - "documentation_url": "https://facebook.github.io/yoga/docs/api/c/", + "homepage": "https://yogalayout.com", + "documentation_url": "https://yogalayout.com/docs/", "summary": "Yoga is a cross-platform layout engine which implements Flexbox.", "description": "Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.", "authors": "Facebook", "source": { - "git": "https://github.com/facebook/react-native.git", - "tag": "v0.59.3" + "git": "https://github.com/jtreanor/react-native.git", + "tag": "v0.60.0-patched" }, "module_name": "yoga", "requires_arc": false, @@ -27,6 +27,7 @@ "ios": "9.0", "tvos": "9.2" }, - "source_files": "ReactCommon/yoga/yoga/**/*.{cpp,h}", - "public_header_files": "ReactCommon/yoga/yoga/{Yoga,YGEnums,YGMacros,YGValue}.h" + "source_files": "yoga/**/*.{cpp,h}", + "public_header_files": "yoga/{Yoga,YGEnums,YGMacros,YGValue}.h", + "prepare_command": "TMP_DIR=$(mktemp -d); mv * $TMP_DIR; cp -R \"$TMP_DIR/ReactCommon/yoga\"/* . && true" } From 150380b021214400acc5c67d1699701d58403fa2 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 28 Jun 2019 16:03:30 +0100 Subject: [PATCH 34/49] Update Gutenberg.podspec & RNTAztec.podspec for new RN CocoaPods integration --- Gutenberg.podspec | 16 +++++----------- RNTAztecView.podspec | 3 ++- ...NReactNativeGutenbergBridge-Bridging-Header.h | 7 +++++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Gutenberg.podspec b/Gutenberg.podspec index 0b078794f4..d0a9b068f8 100644 --- a/Gutenberg.podspec +++ b/Gutenberg.podspec @@ -1,6 +1,8 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) # Use the same RN version that the JS tools use react_native_version = package['dependencies']['react-native'] +# Extract the tagged version if package.json points to a tag +react_native_version = react_native_version.split("#v").last if react_native_version.include? "#v" Pod::Spec.new do |s| s.name = 'Gutenberg' @@ -14,19 +16,11 @@ Pod::Spec.new do |s| s.source_files = 'react-native-gutenberg-bridge/ios/*.{h,m,swift}' s.requires_arc = true s.preserve_paths = 'bundle/ios/*' + s.swift_version = '4.2' - s.dependency 'React/Core', react_native_version - s.dependency 'React/CxxBridge', react_native_version - s.dependency 'React/RCTAnimation', react_native_version - s.dependency 'React/RCTImage', react_native_version - s.dependency 'React/RCTLinkingIOS', react_native_version - s.dependency 'React/RCTNetwork', react_native_version - s.dependency 'React/RCTText', react_native_version - s.dependency 'React/RCTActionSheet', react_native_version - s.dependency 'React/DevSupport', react_native_version + s.dependency 'React-Core', react_native_version + s.dependency 'React-RCTImage', react_native_version s.dependency 'WordPress-Aztec-iOS' s.dependency 'RNTAztecView' - - s.dependency 'yoga', "#{react_native_version}.React" end diff --git a/RNTAztecView.podspec b/RNTAztecView.podspec index 33720fe4ba..4c02f40e43 100644 --- a/RNTAztecView.podspec +++ b/RNTAztecView.podspec @@ -14,9 +14,10 @@ Pod::Spec.new do |s| s.public_header_files = 'react-native-aztec/ios/RNTAztecView/*.h' s.requires_arc = true s.platforms = { :ios => "10.0" } + s.swift_version = '4.2' s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2', 'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'} - s.dependency 'React' + s.dependency 'React-Core' s.dependency 'WordPress-Aztec-iOS' end diff --git a/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge-Bridging-Header.h b/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge-Bridging-Header.h index 208c49d1b3..bab5382e10 100644 --- a/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge-Bridging-Header.h +++ b/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge-Bridging-Header.h @@ -7,4 +7,11 @@ #import #import #import + +// This is needed until gutenberg.xcodeproj is migrated to use CocoaPods +// Or the React projects update their namespacing +#if __has_include() +#import +#else #import +#endif From b56a7dcd443e4b7c1bcbfa248405f7fc3e262028 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 3 Jul 2019 14:54:05 +0100 Subject: [PATCH 35/49] Update bin/generate-podspec.sh to generate podspec for non-RN third party libs --- bin/generate-podspecs.sh | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/bin/generate-podspecs.sh b/bin/generate-podspecs.sh index 30b0139d21..4153864682 100755 --- a/bin/generate-podspecs.sh +++ b/bin/generate-podspecs.sh @@ -11,14 +11,29 @@ cd .. command -v pod > /dev/null || ( echo Cocoapods is required to generate podspecs; exit 1 ) command -v jq > /dev/null || ( echo jq is required to generate podspecs; exit 1 ) -# Change to the React Native directory to get relative paths WD=$(pwd) +DEST="${WD}/react-native-gutenberg-bridge/third-party-podspecs" + +# Generate the external (non-RN podspecs) +EXTERNAL_PODSPECS=$(find "node_modules/react-native/third-party-podspecs" \ + "node_modules/react-native-svg" \ + "node_modules/react-native-keyboard-aware-scroll-view" \ + "node_modules/react-native-recyclerview-list" \ + "node_modules/react-native-safe-area" -type f -name "*.podspec" -print) + +for podspec in $EXTERNAL_PODSPECS +do + pod=$(basename "$podspec" .podspec) + + echo "Generating podspec for $pod" + pod ipc spec $podspec > "$DEST/$pod.podspec.json" +done + +# Generate the React Native podspecs +# Change to the React Native directory to get relative paths for the RN podspecs cd "node_modules/react-native" RN_PODSPECS=$(find * -type f -name "*.podspec" -not -path "third-party-podspecs/*" -print) -EXTERNAL_PODSPECS=$(find "third-party-podspecs" -type f -name "*.podspec" -print) - -DEST="${WD}/react-native-gutenberg-bridge/third-party-podspecs" TMP_DEST=$(mktemp -d) for podspec in $RN_PODSPECS @@ -37,11 +52,3 @@ do # Point to React Native fork. To be removed once https://github.com/facebook/react-native/issues/25349 is closed | .source.git = "https://github.com/jtreanor/react-native.git"' > "$DEST/$pod.podspec.json" done - -for podspec in $EXTERNAL_PODSPECS -do - pod=$(basename "$podspec" .podspec) - - echo "Generating podspec for $pod" - pod ipc spec $podspec > "$DEST/$pod.podspec.json" -done From f39f6ead79b65bdf9a8e14cec87ff7d459ed0f82 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 3 Jul 2019 14:54:24 +0100 Subject: [PATCH 36/49] Use patched third party libraries --- package.json | 10 +++---- ...RNReactNativeRecyclerviewList.podspec.json | 25 +++++++++++++++++ .../third-party-podspecs/RNSVG.podspec.json | 27 +++++++++++++++++++ ...ve-keyboard-aware-scroll-view.podspec.json | 10 +++---- .../react-native-safe-area.podspec.json | 4 +-- .../react-native-video.podspec.json | 2 +- yarn.lock | 21 +++++++-------- 7 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json create mode 100644 react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json diff --git a/package.json b/package.json index 6f44af18e0..66fcfec524 100644 --- a/package.json +++ b/package.json @@ -141,12 +141,12 @@ "react": "16.8.6", "react-native": "jtreanor/react-native#v0.60.0-patched", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", - "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", + "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97", "react-native-modal": "^6.5.0", - "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", - "react-native-safe-area": "^0.5.0", - "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4", + "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6", + "react-native-safe-area": "git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87", + "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json new file mode 100644 index 0000000000..a272a1e99b --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json @@ -0,0 +1,25 @@ +{ + "name": "RNReactNativeRecyclerviewList", + "version": "1.0.0", + "summary": "RNReactNativeRecyclerviewList", + "description": "RNReactNativeRecyclerviewList", + "homepage": "", + "license": "MIT", + "authors": { + "author": "author@domain.cn" + }, + "platforms": { + "ios": "7.0" + }, + "source": { + "git": "https://github.com/author/RNReactNativeRecyclerviewList.git", + "tag": "master" + }, + "source_files": "RNReactNativeRecyclerviewList/**/*.{h,m}", + "requires_arc": true, + "dependencies": { + "React-Core": [ + + ] + } +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json new file mode 100644 index 0000000000..d9e746ad12 --- /dev/null +++ b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json @@ -0,0 +1,27 @@ +{ + "name": "RNSVG", + "version": "9.3.3", + "summary": "SVG library for react-native", + "license": "MIT", + "homepage": "https://github.com/react-native-community/react-native-svg", + "authors": "Horcrux Chen", + "source": { + "git": "https://github.com/react-native-community/react-native-svg.git", + "tag": "9.3.3" + }, + "source_files": "ios/**/*.{h,m}", + "requires_arc": true, + "platforms": { + "ios": "8.0", + "tvos": "9.2" + }, + "dependencies": { + "React-Core": [ + + ], + "React-RCTImage": [ + + ] + }, + "prepare_command": "sed -i \"\" \"s/React\\/RCTImageLoader.h/RCTImage\\/RCTImageLoader.h/g\" ios/Elements/RNSVGImage.m" +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json index 2faaafb6dc..5cf7c22d48 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json @@ -1,6 +1,6 @@ { "name": "react-native-keyboard-aware-scroll-view", - "version": "0.8.6", + "version": "0.8.7", "homepage": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view", "summary": "React Native module to arrange scroll poisition according to keyboard on input fields.", "license": "MIT", @@ -10,13 +10,13 @@ }, "source": { "git": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git", - "tag": "gb-v0.8.6" + "tag": "gb-v0.8.7" }, - "source_files": "ios/RNKeyboardAwareScrollView/*.{h,m}", + "source_files": "ios/RNTKeyboardAwareScrollView/*.{h,m}", "preserve_paths": "**/*.js", "dependencies": { - "React": [ + "React-Core": [ ] } -} \ No newline at end of file +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json index a5ad6ebbca..b6a91580f6 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json @@ -15,8 +15,8 @@ "source_files": "ios/RNSafeArea/*.{h,m}", "preserve_paths": "**/*.js", "dependencies": { - "React": [ + "React-Core": [ ] } -} \ No newline at end of file +} diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json index 626421b229..3e903cc5f6 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json @@ -16,7 +16,7 @@ }, "static_framework": true, "dependencies": { - "React": [ + "React-Core": [ ] }, diff --git a/yarn.lock b/yarn.lock index 64a61e6538..0829ea53b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10632,9 +10632,9 @@ react-native-iphone-x-helper@^1.0.3: resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796" integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag== -"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7": +"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97": version "0.8.7" - resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#ab9d6b88ff6366e49b8a6f97a7dcb114f7d0bbae" + resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97" dependencies: prop-types "^15.6.2" react-native-iphone-x-helper "^1.0.3" @@ -10655,16 +10655,15 @@ react-native-randombytes@^3.5.1: buffer "^4.9.1" sjcl "^1.0.3" -"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab": +"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6": version "1.0.0" - resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab" + resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6" dependencies: prop-types "^15.6.0" -react-native-safe-area@^0.5.0: +"react-native-safe-area@git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87": version "0.5.0" - resolved "https://registry.yarnpkg.com/react-native-safe-area/-/react-native-safe-area-0.5.0.tgz#15523625d32b6f1b1685afbeebc045a9985f2d3a" - integrity sha512-VpqO+54+ikeQ0RCq6xWR9Zhv5GVLo21gBg57s4PtRNpPopNz9J6vak/9Gf7AStVnC4feyk+rCKAnxrHmC3M70g== + resolved "git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87" react-native-sass-transformer@^1.1.1: version "1.4.0" @@ -10675,13 +10674,13 @@ react-native-sass-transformer@^1.1.1: css-to-react-native-transform "^1.8.1" semver "^5.6.0" -"react-native-svg@git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5": +"react-native-svg@git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe": version "9.3.3" - resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#55244dc79ab876550599c82dca763c3eba0153c5" + resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From a6300113d246b755674b494483423c5204c90266 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 5 Jul 2019 11:25:48 +0100 Subject: [PATCH 37/49] Add React-RCTText and React-RCTWebSocket to Gutenberg.podspec --- Gutenberg.podspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gutenberg.podspec b/Gutenberg.podspec index d0a9b068f8..afaa983986 100644 --- a/Gutenberg.podspec +++ b/Gutenberg.podspec @@ -20,6 +20,8 @@ Pod::Spec.new do |s| s.dependency 'React-Core', react_native_version s.dependency 'React-RCTImage', react_native_version + s.dependency 'React-RCTText', react_native_version + s.dependency 'React-RCTWebSocket', react_native_version s.dependency 'WordPress-Aztec-iOS' s.dependency 'RNTAztecView' From 512b7085ee7373ecc79626abba8e5d2620356435 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 5 Jul 2019 12:11:51 +0100 Subject: [PATCH 38/49] Add React-DevSupport to Gutenberg.podspec --- Gutenberg.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/Gutenberg.podspec b/Gutenberg.podspec index afaa983986..cd19247b2b 100644 --- a/Gutenberg.podspec +++ b/Gutenberg.podspec @@ -19,6 +19,7 @@ Pod::Spec.new do |s| s.swift_version = '4.2' s.dependency 'React-Core', react_native_version + s.dependency 'React-DevSupport', react_native_version s.dependency 'React-RCTImage', react_native_version s.dependency 'React-RCTText', react_native_version s.dependency 'React-RCTWebSocket', react_native_version From 571bdd0478a0a56e4fc5669f279eab1002c61180 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 5 Jul 2019 14:55:23 +0100 Subject: [PATCH 39/49] Make Gutenberg.podspec depend on React pod to avoid Native Module errors --- Gutenberg.podspec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Gutenberg.podspec b/Gutenberg.podspec index cd19247b2b..3e727689c6 100644 --- a/Gutenberg.podspec +++ b/Gutenberg.podspec @@ -18,11 +18,8 @@ Pod::Spec.new do |s| s.preserve_paths = 'bundle/ios/*' s.swift_version = '4.2' - s.dependency 'React-Core', react_native_version - s.dependency 'React-DevSupport', react_native_version + s.dependency 'React', react_native_version s.dependency 'React-RCTImage', react_native_version - s.dependency 'React-RCTText', react_native_version - s.dependency 'React-RCTWebSocket', react_native_version s.dependency 'WordPress-Aztec-iOS' s.dependency 'RNTAztecView' From 7d0f6f20e0d7c304fd203062be6386d9de4ae613 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Fri, 5 Jul 2019 15:01:05 +0100 Subject: [PATCH 40/49] Revert third party library updates --- package.json | 8 ++-- ...RNReactNativeRecyclerviewList.podspec.json | 2 +- ...ve-keyboard-aware-scroll-view.podspec.json | 2 +- .../react-native-safe-area.podspec.json | 6 +-- yarn.lock | 39 ++++++++++++++----- 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 66fcfec524..565382ed89 100644 --- a/package.json +++ b/package.json @@ -141,12 +141,12 @@ "react": "16.8.6", "react-native": "jtreanor/react-native#v0.60.0-patched", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", - "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97", + "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", - "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6", - "react-native-safe-area": "git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87", + "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", + "react-native-safe-area": "^0.5.0", "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe", - "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6", + "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4", "react-redux": "^5.0.7", "redux": "^3.7.2", "redux-multi": "^0.1.12", diff --git a/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json index a272a1e99b..c1d5db05cd 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/RNReactNativeRecyclerviewList.podspec.json @@ -18,7 +18,7 @@ "source_files": "RNReactNativeRecyclerviewList/**/*.{h,m}", "requires_arc": true, "dependencies": { - "React-Core": [ + "React": [ ] } diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json index 5cf7c22d48..bbd62d4f1c 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json @@ -15,7 +15,7 @@ "source_files": "ios/RNTKeyboardAwareScrollView/*.{h,m}", "preserve_paths": "**/*.js", "dependencies": { - "React-Core": [ + "React": [ ] } diff --git a/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json index b6a91580f6..1f29dbca5a 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json @@ -1,6 +1,6 @@ { "name": "react-native-safe-area", - "version": "0.5.0", + "version": "0.5.1", "homepage": "https://github.com/miyabi/react-native-safe-area", "summary": "React Native module to retrieve safe area insets for iOS 11 or later.", "license": "MIT", @@ -10,12 +10,12 @@ }, "source": { "git": "https://github.com/miyabi/react-native-safe-area.git", - "tag": "v0.5.0" + "tag": "v0.5.1" }, "source_files": "ios/RNSafeArea/*.{h,m}", "preserve_paths": "**/*.js", "dependencies": { - "React-Core": [ + "React": [ ] } diff --git a/yarn.lock b/yarn.lock index 0829ea53b4..b32b3cf7e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2213,6 +2213,19 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.3.tgz#7c6b0f8eaf16ae530795de2ad1b85d34bf2f5c58" integrity sha512-wp6IOGu1lxsfnrD+5mX6qwSwWuqsdkKKxTN4aQc4wByHAKZJf9/D4KXPQ1POUjEbnCP5LMggB0OEFNY9OTsMqg== +"@types/prop-types@*": + version "15.7.1" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6" + integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg== + +"@types/react@^16.8.8": + version "16.8.23" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.23.tgz#ec6be3ceed6353a20948169b6cb4c97b65b97ad2" + integrity sha512-abkEOIeljniUN9qB5onp++g0EY38h7atnDHxwKUFz1r3VH1+yG1OKi2sNPTyObL40goBmfKFpdii2lEzwLX1cA== + dependencies: + "@types/prop-types" "*" + csstype "^2.2.0" + "@types/stack-utils@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" @@ -4670,6 +4683,11 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" +csstype@^2.2.0: + version "2.6.5" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.5.tgz#1cd1dff742ebf4d7c991470ae71e12bb6751e034" + integrity sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA== + csv-parser@^1.6.0: version "1.12.1" resolved "https://registry.yarnpkg.com/csv-parser/-/csv-parser-1.12.1.tgz#391e1ef961b1f9dcb4c7c0f82eb450a1bd916158" @@ -10632,9 +10650,9 @@ react-native-iphone-x-helper@^1.0.3: resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.0.tgz#9f8a376eb00bc712115abff4420318a0063fa796" integrity sha512-xIeTo4s77wwKgBZLVRIZC9tM9/PkXS46Ul76NXmvmixEb3ZwqGdQesR3zRiLMOoIdfOURB6N9bba9po7+x9Bag== -"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97": +"react-native-keyboard-aware-scroll-view@git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7": version "0.8.7" - resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#382ae9b44e2baa650838c703b969c26ecd64bf97" + resolved "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#ab9d6b88ff6366e49b8a6f97a7dcb114f7d0bbae" dependencies: prop-types "^15.6.2" react-native-iphone-x-helper "^1.0.3" @@ -10655,15 +10673,18 @@ react-native-randombytes@^3.5.1: buffer "^4.9.1" sjcl "^1.0.3" -"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6": +"react-native-recyclerview-list@git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab": version "1.0.0" - resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#afeed73685b5ffde4f70431ececb7fcb9e96b6b6" + resolved "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab" dependencies: prop-types "^15.6.0" -"react-native-safe-area@git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87": - version "0.5.0" - resolved "git+https://github.com/wordpress-mobile/react-native-safe-area#ff1002a03e34bfabf0bb65da0644af8f1b31fb87" +react-native-safe-area@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/react-native-safe-area/-/react-native-safe-area-0.5.1.tgz#b0263f5fcd1341c74dee0e5f0b296da965242a14" + integrity sha512-gBLv93P90sM6hk5HzUwTXzFuSDazTpg2ONi5iL9pnUsUfwdw2L9SKgjgVroxX10leGB9+0zz6/ycV+mItqr8OQ== + dependencies: + "@types/react" "^16.8.8" react-native-sass-transformer@^1.1.1: version "1.4.0" @@ -10678,9 +10699,9 @@ react-native-sass-transformer@^1.1.1: version "9.3.3" resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe" -"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6": +"react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4": version "4.4.1" - resolved "git+https://github.com/wordpress-mobile/react-native-video.git#6223b6213a017a2e8b7b8f940fa14760625c87f6" + resolved "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4" dependencies: keymirror "^0.1.1" prop-types "^15.5.10" From 3c91f406f2997efb174fa38c7329b8d0f24ff7a0 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 5 Jul 2019 11:26:42 -0400 Subject: [PATCH 41/49] Updated gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 10416fc8a6..21e2dce2b2 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 10416fc8a64a6be6c62ad67fefb01a0a62871790 +Subproject commit 21e2dce2b287347e21c3e0618bc8fa8c0c1ef5ca From c2e30939c4c4570237384115105621dc15cd34ae Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 5 Jul 2019 12:47:11 -0400 Subject: [PATCH 42/49] Updated gutenberg reference --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 21e2dce2b2..ab847cb2a0 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 21e2dce2b287347e21c3e0618bc8fa8c0c1ef5ca +Subproject commit ab847cb2a05a1e484f735a92789ef73742b89302 From 7445cc3d93158cf4d97d608894f4b229967ddb43 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 8 Jul 2019 10:59:22 -0400 Subject: [PATCH 43/49] Updated gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index baa249842c..0d9efe2720 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit baa249842cda1f6cb4827c379bf8b77f42b13394 +Subproject commit 0d9efe27209c396ec6209622d58d706f2e8167c5 From c9ad20f4dc158726656f849b2071fa5f17099ade Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 8 Jul 2019 13:39:10 -0400 Subject: [PATCH 44/49] Update release notes --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 88f93393fd..18b9770054 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,7 @@ +1.9.0 +------ +* Enable video block editor on the Android platform + 1.8.0 ------ * Fix pasting simple text on Post Title From 393983b77309b450ea8fc2a48a224649b88ee564 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 9 Jul 2019 11:44:39 +0100 Subject: [PATCH 45/49] Update react-native-svg version --- package.json | 2 +- .../third-party-podspecs/RNSVG.podspec.json | 6 +++--- yarn.lock | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 565382ed89..1d7b645902 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "react-native-modal": "^6.5.0", "react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#eadaa2f62d2f488d4dc80f9148e52b62047297ab", "react-native-safe-area": "^0.5.0", - "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe", + "react-native-svg": "git+https://github.com/wordpress-mobile/react-native-svg.git#f16e9adae71c6cf3158f2356cf95fff5c2075e0f", "react-native-video": "git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4", "react-redux": "^5.0.7", "redux": "^3.7.2", diff --git a/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json index d9e746ad12..facaedc193 100644 --- a/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json +++ b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json @@ -1,13 +1,13 @@ { "name": "RNSVG", - "version": "9.3.3", + "version": "9.3.3-gb", "summary": "SVG library for react-native", "license": "MIT", "homepage": "https://github.com/react-native-community/react-native-svg", "authors": "Horcrux Chen", "source": { - "git": "https://github.com/react-native-community/react-native-svg.git", - "tag": "9.3.3" + "git": "https://github.com/wordpress-mobile/react-native-svg.git", + "tag": "9.3.3-gb" }, "source_files": "ios/**/*.{h,m}", "requires_arc": true, diff --git a/yarn.lock b/yarn.lock index b32b3cf7e1..b470a23fad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10695,9 +10695,9 @@ react-native-sass-transformer@^1.1.1: css-to-react-native-transform "^1.8.1" semver "^5.6.0" -"react-native-svg@git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe": - version "9.3.3" - resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#466a40ec77080e1b64b5a1a3c779cdfdc04b3abe" +"react-native-svg@git+https://github.com/wordpress-mobile/react-native-svg.git#f16e9adae71c6cf3158f2356cf95fff5c2075e0f": + version "9.3.3-gb" + resolved "git+https://github.com/wordpress-mobile/react-native-svg.git#f16e9adae71c6cf3158f2356cf95fff5c2075e0f" "react-native-video@git+https://github.com/wordpress-mobile/react-native-video.git#3a0e2fa6fc6bf1fe1a54adb2dbf94545b28c2bc4": version "4.4.1" From a1b834dece290c5d28e80cc264d94642095b25e1 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 12:08:32 +0300 Subject: [PATCH 46/49] Update Aztec hash --- react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle index c2347ef397..a0ecb6c65a 100644 --- a/react-native-aztec/android/build.gradle +++ b/react-native-aztec/android/build.gradle @@ -12,7 +12,7 @@ buildscript { wordpressUtilsVersion = '1.22' espressoVersion = '3.0.1' - aztecVersion = 'd5a3dfec60987a8ff0b8717bd204390b6e42d0bd' + aztecVersion = 'f80c55aa45d6ec5c045016e3c9e8c8e9e1bbc3ad' } repositories { From 4107bf6e016660445289add2dee82f4b16ade9bf Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 14:58:58 +0300 Subject: [PATCH 47/49] ArrayList for bridge parameter So we don't need to make the client app directly import React Native classes. --- .../wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java index 1f5a507b0b..48bc0fedf2 100644 --- a/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java +++ b/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java @@ -38,6 +38,7 @@ import org.wordpress.mobile.ReactNativeGutenbergBridge.RNReactNativeGutenbergBridgePackage; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; @@ -115,7 +116,7 @@ public interface OnReattachQueryListener { } public interface OnEditorMountListener { - void onEditorDidMount(ReadableArray unsupportedBlockNames); + void onEditorDidMount(ArrayList unsupportedBlockNames); } public interface OnAuthHeaderRequestedListener { @@ -202,7 +203,7 @@ public void requestImageUploadCancel(int mediaId) { @Override public void editorDidMount(ReadableArray unsupportedBlockNames) { - mOnEditorMountListener.onEditorDidMount(unsupportedBlockNames); + mOnEditorMountListener.onEditorDidMount(unsupportedBlockNames.toArrayList()); mIsEditorMounted = true; if (TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mContentHtml)) { setFocusOnTitle(); From b0a7b855251104f211336a36463a9de2f7ba24e6 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 11:39:01 -0400 Subject: [PATCH 48/49] Revert release note which explains that video block is enabled for Android platform --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index bc4de77bf0..6f9f8c9901 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,5 @@ 1.9.0 ------ -* Enable video block editor on the Android platform * Tapping on an empty editor area will create a new paragraph block * Fix content loss issue when loading unsupported blocks containing inner blocks. * Adding a block from the Post Title now inserts the block at the top of the Post. From a412674e4246a082ef1d80ce559b3f7d5c0994bf Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 14:00:03 -0400 Subject: [PATCH 49/49] Point Aztec to v1.3.28 --- react-native-aztec/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-native-aztec/android/build.gradle b/react-native-aztec/android/build.gradle index a0ecb6c65a..819eeb5c6f 100644 --- a/react-native-aztec/android/build.gradle +++ b/react-native-aztec/android/build.gradle @@ -12,7 +12,7 @@ buildscript { wordpressUtilsVersion = '1.22' espressoVersion = '3.0.1' - aztecVersion = 'f80c55aa45d6ec5c045016e3c9e8c8e9e1bbc3ad' + aztecVersion = 'v1.3.28' } repositories {