Merge pull request #2138 from ampproject/bump/1.1.0

Bump 1.1.0
ampproject · Apr 16, 2019 · 70934bb · 70934bb
2 parents 06f75c4 + 5a16def
commit 70934bb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/amp.php b/amp.php
@@ -5,7 +5,7 @@
  * Plugin URI: https://amp-wp.org
  * Author: AMP Project Contributors
  * Author URI: https://github.com/ampproject/amp-wp/graphs/contributors
- * Version: 1.1-RC1
+ * Version: 1.1.0
  * Text Domain: amp
  * Domain Path: /languages/
  * License: GPLv2 or later
@@ -115,7 +115,7 @@ function _amp_print_build_needed_notice() {
 
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '1.1-RC1' );
+define( 'AMP__VERSION', '1.1.0' );
 
 /**
  * Print admin notice if plugin installed with incorrect slug (which impacts WordPress's auto-update system).

diff --git a/bin/verify-version-consistency.php b/bin/verify-version-consistency.php
@@ -21,19 +21,6 @@
 }
 $versions['readme.txt#stable-tag'] = $matches['version'];
 
-if ( ! preg_match( '/== Changelog ==\s+=\s+(?P<version>\d+\.\d+(?:.\d+)?)/', $readme_txt, $matches ) ) {
-	echo "Could not find version i  n readme.txt changelog\n";
-	exit( 1 );
-}
-$versions['readme.txt#changelog'] = $matches['version'];
-
-$readme_md = file_get_contents( dirname( __FILE__ ) . '/../readme.md' );
-if ( ! preg_match( '/## Changelog ##\s+###\s+(?P<version>\d+\.\d+(?:.\d+)?)/', $readme_md, $matches ) ) {
-	echo "Could not find version in readme.md changelog\n";
-	exit( 1 );
-}
-$versions['readme.md#changelog'] = $matches['version'];
-
 $plugin_file = file_get_contents( dirname( __FILE__ ) . '/../amp.php' );
 if ( ! preg_match( '/\*\s*Version:\s*(?P<version>\d+\.\d+(?:.\d+)?(-\w+)?)/', $plugin_file, $matches ) ) {
 	echo "Could not find version in readme metadata\n";

diff --git a/package-lock.json b/package-lock.json
diff --git a/readme.md b/readme.md
@@ -8,7 +8,7 @@ Enable AMP on your WordPress site, the WordPress way.
 **Tags:** [amp](https://wordpress.org/plugins/tags/amp), [mobile](https://wordpress.org/plugins/tags/mobile)  
 **Requires at least:** 4.9  
 **Tested up to:** 5.1  
-**Stable tag:** 1.0.2  
+**Stable tag:** 1.1.0  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 **Requires PHP:** 5.4  
 

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: automattic, xwp, google, westonruter, ryankienstra, batmoo, stubgo
 Tags: amp, mobile
 Requires at least: 4.9
 Tested up to: 5.1
-Stable tag: 1.0.2
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Requires PHP: 5.4