Skip to content

Commit

Permalink
Merge pull request #499 from wordpress-mobile/release/0.3.4
Browse files Browse the repository at this point in the history
Release v0.3.4
  • Loading branch information
hypest authored Jan 24, 2019
2 parents 7244664 + 3113af1 commit 9efa2fa
Show file tree
Hide file tree
Showing 137 changed files with 15,417 additions and 1,207 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ gutenberg
symlinked-packages-in-parent
react-native-aztec
bundle

react-native-aztec-old-submodule
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
path = gutenberg
url = ../../WordPress/gutenberg.git
[submodule "react-native-aztec"]
path = react-native-aztec
path = react-native-aztec-old-submodule
url = ../react-native-aztec.git
22 changes: 22 additions & 0 deletions RNTAztecView.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
require 'json'

package = JSON.parse(File.read(File.join(__dir__, 'package.json')))

Pod::Spec.new do |s|
s.name = 'RNTAztecView'
s.version = package['version']
s.summary = 'Aztec editor for React Native'
s.license = package['license']
s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile'
s.authors = 'Automattic'
s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' }
s.source_files = 'react-native-aztec/ios/RNTAztecView/*.{h,m,swift}'
s.public_header_files = 'react-native-aztec/ios/RNTAztecView/*.h'
s.requires_arc = true
s.platforms = { :ios => "10.0" }
s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2',
'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
s.dependency 'React'
s.dependency 'WordPress-Aztec-iOS'

end
3 changes: 3 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ buildscript {
}
}

// Load the "build from source" flag value but default to `true` since this is the demo gutenberg-mobile project so
project.ext.buildGutenbergFromSource = project.properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', true).toBoolean()

allprojects {
repositories {
mavenLocal()
Expand Down
76 changes: 76 additions & 0 deletions bin/update-bintray-repo.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#!/bin/sh

# Check for jfrog-cli-go
command -v jfrog > /dev/null || { echo "jfrog-cli-go is required to update the repo. Install it with 'brew install jfrog-cli-go'" >&2; exit 1; }
# Check for xmlstarlet
command -v xmlstarlet > /dev/null || { echo "xmlstarlet is required to update the repo. Install it with 'brew install xmlstarlet'" >&2; exit 1; }

# Exit if any command fails
set -e

# Change to the expected directory.
cd "$( dirname $0 )"
cd ..

TMP_WORKING_DIRECTORY=$(mktemp -d)

BINTRAY_REPO="wordpress-mobile/react-native-mirror"
PACKAGE_PATHS=("node_modules/react-native/android/com/facebook/react/react-native" "node_modules/jsc-android/dist/org/webkit/android-jsc")

package_name () {
local PACKAGE_PATH="$1"
xmlstarlet sel -t -v "/metadata/artifactId" "$PACKAGE_PATH/maven-metadata.xml"
}

package_version () {
local PACKAGE_PATH="$1"
xmlstarlet sel -t -v "/metadata/versioning/versions/version" "$PACKAGE_PATH/maven-metadata.xml"
}

check_bintray_version () {
local PACKAGE_NAME="$1"
local PACKAGE_VERSION="$2"

jfrog bt version-show "${BINTRAY_REPO}/${PACKAGE_NAME}/${PACKAGE_VERSION}" &> /dev/null && echo "0" || echo "1"
}

create_bintray_version () {
local PACKAGE_NAME="$1"
local PACKAGE_VERSION="$2"
local PACKAGE_PATH="$3"

local BINTRAY_VERSION="${BINTRAY_REPO}/${PACKAGE_NAME}/${PACKAGE_VERSION}"
local GROUP_PATH=$(xmlstarlet sel -t -v "/metadata/groupId" "$PACKAGE_PATH/maven-metadata.xml" | tr "." "/")

jfrog bt version-create "${BINTRAY_VERSION}"
jfrog bt upload "${PACKAGE_PATH}/${PACKAGE_VERSION}/*" "${BINTRAY_VERSION}" "${GROUP_PATH}/${PACKAGE_NAME}/${PACKAGE_VERSION}/"
jfrog bt version-publish "${BINTRAY_VERSION}"
}

# Sign into Bintray
echo "Please sign into Bintray..."
echo "You can find your Bintray API key here: https://bintray.com/profile/edit"
jfrog bt config

# Yarn install
echo "Running yarn install in '${TMP_WORKING_DIRECTORY}'..."
cp "package.json" "${TMP_WORKING_DIRECTORY}/"
cp "yarn.lock" "${TMP_WORKING_DIRECTORY}/"
cd "${TMP_WORKING_DIRECTORY}"
yarn install --silent

# Find local packages in node_modules/
echo "Getting local package details..."
for PACKAGE_PATH in "${PACKAGE_PATHS[@]}"; do
PACKAGE_NAME=$(package_name "${PACKAGE_PATH}")
PACKAGE_VERSION=$(package_version "${PACKAGE_PATH}")

echo "Checking ${PACKAGE_NAME}@${PACKAGE_VERSION} on Bintray..."
NEEDS_UPDATE=$(check_bintray_version "${PACKAGE_NAME}" "${PACKAGE_VERSION}")
if [ "$NEEDS_UPDATE" == "0" ]; then
echo "${PACKAGE_NAME}@${PACKAGE_VERSION} is already up to date on Bintray"
else
echo "Uploading ${PACKAGE_NAME}@${PACKAGE_VERSION} to Bintray..."
create_bintray_version "${PACKAGE_NAME}" "${PACKAGE_VERSION}" "${PACKAGE_PATH}"
fi
done
724 changes: 363 additions & 361 deletions bundle/android/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map

Large diffs are not rendered by default.

736 changes: 369 additions & 367 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 603 files
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
'/gutenberg/packages/',
],
testURL: 'http://localhost/',
modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile', 'react-native-aztec-old-submodule' ],
moduleDirectories: [ 'node_modules', 'symlinked-packages' ],
moduleNameMapper: {
// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets
Expand Down
4 changes: 4 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
before_install:
- yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-27"
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;27.0.3"
install:
- echo "Changing into the android folder of the Bridge module"
- pushd react-native-gutenberg-bridge/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd
- pushd react-native-aztec/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"react": "16.6.1",
"react-native": "0.57.5",
"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.2",
"react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.3",
"react-native-modal": "^6.5.0",
"react-native-recyclerview-list": "git+https://github.com/wordpress-mobile/react-native-recyclerview-list.git#v1.0.0",
"react-native-safe-area": "^0.5.0",
Expand Down
1 change: 0 additions & 1 deletion react-native-aztec
Submodule react-native-aztec deleted from 7382ae
1 change: 1 addition & 0 deletions react-native-aztec-old-submodule
11 changes: 11 additions & 0 deletions react-native-aztec/.flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[ignore]

[include]

[libs]

[lints]

[options]

[strict]
119 changes: 119 additions & 0 deletions react-native-aztec/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
# OS X generated file
.DS_Store

# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/
build/

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
.settings/
.classpath
.project

# Intellij project files
*.iml
*.ipr
*.iws
.idea/

# Gradle
.gradle/
gradle.properties

# Generated by gradle
crashlytics.properties

# npm
node_modules/

# yarn
yarn-error.log

###
### Starting at this point, the Swift .gitignore rules from https://github.com/github/gitignore/blob/master/Swift.gitignore
###

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.

ios/Carthage
Carthage/Checkouts
Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

Loading

0 comments on commit 9efa2fa

Please sign in to comment.