Skip to content

Commit

Permalink
Merge branch 'develop' into gutenberg/upgrade-RN-0-64
Browse files Browse the repository at this point in the history
cameronvoell committed May 24, 2021
2 parents 351a674 + fc5d54c commit a1ffac6
Showing 1,793 changed files with 117,992 additions and 57,926 deletions.
308 changes: 69 additions & 239 deletions .circleci/config.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"project_name": "WordPress-Android",
"branch": "trunk",
"pinned_hash": "3e2b97bc9ea33aae58bb348933f4fee7cda5e691",
"pinned_hash": "92cde8f76c2a77791f8e5164f1e5b287d9cb6f1e",
"files_to_copy": [
{
"file": "android/WPAndroid/gradle.properties",
Binary file modified .configure-files/google-services.json.enc
Binary file not shown.
Binary file modified .configure-files/gradle.properties.enc
Binary file not shown.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
# Apply to all files
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# Ruby specific rules
[{*.rb,Fastfile,Gemfile}]
indent_style = space
indent_size = 2

[*.{kt,kts}]
max_line_length=120
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -5,4 +5,5 @@ gradlew text eol=lf
*.bat text eol=crlf
*.png binary
*.jpg binary
.configure-files/*.enc binary
RELEASE-NOTES.txt merge=union
11 changes: 10 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -2,8 +2,17 @@ Fixes #

To test:

## Regression Notes
1. Potential unintended areas of impact


2. What I did to test those areas of impact (or what existing automated tests I relied on)


3. What automated tests I added (or what prevented me from doing so)

PR submission checklist:

- [ ] I have considered adding unit tests where possible.
- [ ] I have completed the Regression Notes.
- [ ] I have considered adding accessibility improvements for my changes.
- [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ local.properties
*.iml
*.ipr
*.iws
/.idea/*
.idea/

# IntelliJ/Android Studio exceptions
!/.idea/codeStyles/
@@ -39,7 +39,6 @@ local.properties
!/.idea/codeStyleSettings.xml
!/.idea/encodings.xml
!/.idea/copyright/
!/.idea/compiler.xml
# Enforce plugins
!/.idea/externalDependencies.xml
# Checkstyle configuration
@@ -92,3 +91,9 @@ WordPress/debug.keystore
WordPress/*.jks

local-builds.gradle

# Currently, the configure tool stores the encrypted files under
# .configure-files. Everything in that folder without a .enc extension should
# be ignored.
.configure-files/*
!.configure-files/*.enc
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "libs/gutenberg-mobile"]
path = libs/gutenberg-mobile
url = ../../wordpress-mobile/gutenberg-mobile.git
shallow = true
[submodule "libs/stories-android"]
path = libs/stories-android
url = ../../Automattic/stories-android.git
13 changes: 11 additions & 2 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions .idea/compiler.xml

This file was deleted.

8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

source "https://rubygems.org" do
gem 'fastlane', "~> 2"
gem 'nokogiri'
end
source "https://rubygems.org"

gem 'fastlane', "~> 2"
gem 'nokogiri'

plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
Loading

0 comments on commit a1ffac6

Please sign in to comment.