Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.5.0 #988

Merged
merged 76 commits into from
May 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
ae6d3da
Update gutenberg ref
etoledom Apr 29, 2019
64eb0a7
Merge pull request #940 from wordpress-mobile/try/test-uitest-ci
etoledom Apr 29, 2019
0f23262
Add textAlign prop for setting horizontal gravity on Android
mchowning Apr 29, 2019
5dd53d9
Adding text alignment attribute to Aztec Wrapper iOS
etoledom Apr 30, 2019
ecf86a5
Cleanup RCTAztecViewManager
etoledom Apr 30, 2019
0649a51
Add instructions for running simulator with other iOS devices.
iamthomasbishop Apr 30, 2019
014bb9c
Squashed commit of the following:
Tug May 2, 2019
da206d3
Update gutenberg ref
Tug May 2, 2019
50c4652
Retain cursor position on select
Tug May 2, 2019
abeffb3
REMOVE ME BEFORE MERGE: simplify initial html
Tug May 2, 2019
703a0a4
Do not clear current block selection when adding a block
Tug May 2, 2019
aeeb7ba
Update gutenberg ref
Tug May 2, 2019
daacd40
Reset unintended whitespace removals
iamthomasbishop May 2, 2019
b005b02
Update gutenberg ref to master
etoledom May 3, 2019
26ddf42
Merge branch 'develop' into feature/caption
etoledom May 3, 2019
3dd0968
Merge branch 'feature/caption' into feature/add_text_align_prop
mchowning May 3, 2019
ce50de3
Manually resolving merge conflict
mchowning May 3, 2019
c109209
Update gutenberg ref
mchowning May 3, 2019
d31b4b6
Revert "Update gutenberg repo to point to `rnmobile/master-fork-befor…
pinarol May 3, 2019
8020dd3
Merge pull request #957 from wordpress-mobile/release/1.4.0
loremattei May 3, 2019
46bbc2f
Update gutenberg ref
mchowning May 3, 2019
d1d0b64
Simplify onSplit in BlockHolder and make it the same as the web version
Tug May 3, 2019
8dfb6f8
Update gutenberg ref
Tug May 6, 2019
c1dfb9e
Clean up instructions copy
iamthomasbishop May 6, 2019
25f671f
Merge pull request #944 from wordpress-mobile/update/add-ios-simulato…
iamthomasbishop May 6, 2019
2495469
Merge remote-tracking branch 'origin/develop' into fix/android-rich-t…
Tug May 6, 2019
063d5bd
Update gutenberg ref
Tug May 7, 2019
c30138b
CircleCI: Limit max Jest and Flow workers to avoid memory errors
jtreanor May 7, 2019
f7ed45f
Update gutenberg ref
Tug May 7, 2019
a5d68eb
Use 'yarn x' syntax instead of 'yarn run x'
jtreanor May 7, 2019
3fcc2e1
Merge pull request #964 from wordpress-mobile/circleci-memory-issues
jtreanor May 7, 2019
ce74c70
Remove duplicated imagepipeline-okhttp3 dependency (#905)
marecar3 May 7, 2019
1c2c67a
Update gutenberg ref
Tug May 8, 2019
40a415b
Fix CI tests
Tug May 8, 2019
cceace8
Mock focusing components on react native
Tug May 8, 2019
95f7d9a
Revert "REMOVE ME BEFORE MERGE: simplify initial html"
Tug May 8, 2019
9fe49e6
Update Gutenberg hash
hypest May 9, 2019
049389f
Update gutenberg ref
etoledom May 9, 2019
9637fa9
Update Gutenberg to master (#962)
koke May 10, 2019
13edd35
Improve accessibility on missing block (#959)
koke May 10, 2019
c57f200
Merge pull request #941 from mchowning/feature/add_text_align_prop
etoledom May 10, 2019
bb9f1f1
Update gutenberg ref
etoledom May 10, 2019
b92a9d5
Merge branch 'develop' into feature/caption
etoledom May 10, 2019
92be0c5
Add video block ( first iteration ) (#854)
pinarol May 12, 2019
6556d28
Fix stray selection events from AztecAndroid
hypest May 12, 2019
30d52c9
Update GB hash
hypest May 13, 2019
dead219
Update gutenberg ref
etoledom May 13, 2019
f1286ce
Update gutenberg ref
etoledom May 13, 2019
fde8338
Update gutenberg ref
etoledom May 13, 2019
f83162f
Update gutenberg ref
etoledom May 13, 2019
ed8fe7c
Merge branch 'develop' into feature/caption
etoledom May 13, 2019
d8a7253
Update from develop
hypest May 14, 2019
1871108
Update gutenberg ref
etoledom May 14, 2019
e4d23fa
Update gutenberg ref
etoledom May 15, 2019
a0240cd
Update gutenberg ref
Tug May 15, 2019
dee8eca
Merge pull request #949 from wordpress-mobile/fix/android-rich-text-e…
Tug May 15, 2019
a49d5f4
Update gutenberg ref
etoledom May 15, 2019
3b0ec1f
Merge branch 'develop' into feature/caption
etoledom May 15, 2019
467c015
Add a release notes file
hypest May 15, 2019
0314fe7
Start from the next version
hypest May 15, 2019
921e3e3
Add a PR template, nudging for release-notes update too
hypest May 15, 2019
912f2dd
Point to AztecAndroid's v1.3.27 tag
hypest May 16, 2019
eba1b5f
Merge pull request #983 from wordpress-mobile/update/aztec-android-to…
hypest May 16, 2019
68254be
Update gutenberg ref to master
etoledom May 16, 2019
2d448a3
Merge pull request #975 from wordpress-mobile/feature/caption
etoledom May 16, 2019
4faf53b
Merge hotfix v1.4.1 back to develop
mkevins May 16, 2019
2df7310
Merge pull request #985 from wordpress-mobile/fix/merge-hotfix-v1.4.1…
hypest May 16, 2019
b2c1e28
Merge pull request #982 from wordpress-mobile/issue/786-add-release-n…
hypest May 16, 2019
3e70f8d
Update gutenberg ref
etoledom May 16, 2019
aa4d27e
Update version to 1.5.0
koke May 16, 2019
daf995a
Update gutenberg ref
etoledom May 17, 2019
0739e73
Update gutenberg ref
etoledom May 17, 2019
0ccd91e
Merge pull request #987 from wordpress-mobile/issue/rich-text-caption…
etoledom May 17, 2019
bb7264d
Update bundles after latest fix
koke May 17, 2019
b70d68e
Fix insert list block focus (#994)
etoledom May 17, 2019
1ab2e87
Merge branch 'master' into release/1.5.0
koke May 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we
; mock/ignore style files
module.name_mapper='.*\(.scss\)' -> 'empty/object'

server.max_workers=4

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RELEASE-NOTES.txt merge=union
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Fixes #

To test:

Update release notes:

- [ ] If there are user facing changes, I have added an item to `RELEASE-NOTES.txt`.
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,30 @@ yarn android

The app should now open in a connected device or a running emulator and fetch the JavaScript code from the running packager.

To compile and run the iOS variant of the app, use:
To compile and run the iOS variant of the app using the _default_ simulator device, use:

```
yarn ios
```

which will attempt to open your app in the iOS Simulator if you're on a Mac and have it installed.

### Running on Other iOS Device Simulators

To compile and run the app using a different device simulator, use:

```
yarn ios --simulator="DEVICE_NAME"
```

For example, if you'd like to run in an iPhone Xs Max, try:

```
yarn ios --simulator="iPhone Xs Max"
```

To see a list of all of your available iOS devices, use `xcrun simctl list devices`.

### When things seem crazy

Some times, and especially when tweaking anything in the `package.json`, Babel configuration (`.babelrc`) or the Jest configuration (`jest.config.js`), your changes might seem to not take effect as expected. On those times, you might need to clean various caches before starting the packager. To do that, run the script: `yarn start:reset`. Other times, you might want to reinstall the NPM packages from scratch and the `yarn clean:install` script can be handy.
Expand Down
2 changes: 2 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1.6.0
------
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ configurations.all {
}

dependencies {
implementation project(':react-native-video')
implementation project(':react-native-svg')
implementation project(':react-native-aztec')
implementation project(':react-native-recyclerview-list')
Expand Down
8 changes: 5 additions & 3 deletions android/app/src/main/java/com/gutenberg/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.util.Log;

import com.facebook.react.ReactApplication;
import com.brentvatne.react.ReactVideoPackage;
import com.horcrux.svg.SvgPackage;

import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
Expand Down Expand Up @@ -32,6 +33,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new ReactVideoPackage(),
new SvgPackage(),
new ReactAztecPackage(),
new RNRecyclerviewListPackage(),
Expand All @@ -40,13 +42,13 @@ protected List<ReactPackage> getPackages() {
public void responseHtml(String title, String html, boolean changed) {}

@Override
public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback) {}
public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, MediaType mediaType) {}

@Override
public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback) {}
public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, MediaType mediaType) {}

@Override
public void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCallback) {}
public void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCallback, MediaType mediaType) {}

@Override
public void requestMediaImport(String url, MediaSelectedCallback mediaSelectedCallback) {}
Expand Down
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'gutenberg'
include ':react-native-video'
project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android-exoplayer')
include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':react-native-aztec'
Expand Down
4 changes: 3 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = function( api ) {
'@babel/plugin-transform-react-jsx',
{
pragma: 'createElement',
pragmaFrag: 'Fragment',
},
],
],
Expand All @@ -33,9 +34,10 @@ module.exports = function( api ) {
{ // Auto-add `import { createElement } from '@wordpress/element';` when JSX is found
plugins: [
[
'@wordpress/babel-plugin-import-jsx-pragma',
'./gutenberg/packages/babel-plugin-import-jsx-pragma',
{
scopeVariable: 'createElement',
scopeVariableFrag: 'Fragment',
source: '@wordpress/element',
isDefault: false,
},
Expand Down
10 changes: 5 additions & 5 deletions bin/ci-checks-js.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if [[ -z "${CHECK_CORRECTNESS}" ]] && [[ -z "${CHECK_TESTS}" ]] ; then
fi

if [ "$CHECK_CORRECTNESS" = true ] ; then
npm run flow || pFail
npm run lint || pFail
yarn flow || pFail
yarn lint || pFail
fi

if [ "$GUTENBERG_AS_PARENT" = true ] ; then
Expand All @@ -27,9 +27,9 @@ fi
if [ "$CHECK_TESTS" = true ] ; then
# we'll run the tests twich (once for each platform) if the platform env var is not set
if [[ -z "${TEST_RN_PLATFORM}" ]] ; then
TEST_RN_PLATFORM=android npm run ${TEST_SCRIPT_NAME} || pFail
TEST_RN_PLATFORM=ios npm run ${TEST_SCRIPT_NAME} || pFail
TEST_RN_PLATFORM=android yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
TEST_RN_PLATFORM=ios yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
else
npm run ${TEST_SCRIPT_NAME} || pFail
yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
fi
fi
Loading