Skip to content

Commit

Permalink
Merge branch 'develop' into fix/update-api-version
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Aug 21, 2024
2 parents 9646c3f + d687069 commit 72f40b4
Show file tree
Hide file tree
Showing 7 changed files with 6,544 additions and 3,712 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
core:
- {name: 'WP latest', version: 'latest'}
- {name: 'WP minimum', version: 'WordPress/WordPress#5.8'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.4'}
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
steps:
- name: Checkout
Expand Down Expand Up @@ -60,14 +60,3 @@ jobs:
npx mochawesome-json-to-md -p ./tests/cypress/reports/mochawesome.json -o ./tests/cypress/reports/mochawesome.md
npx mochawesome-report-generator tests/cypress/reports/mochawesome.json -o tests/cypress/reports/
cat ./tests/cypress/reports/mochawesome.md >> $GITHUB_STEP_SUMMARY
- name: Make artifacts available
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-artifact
retention-days: 2
path: |
${{ github.workspace }}/tests/cypress/screenshots/
${{ github.workspace }}/tests/cypress/videos/
${{ github.workspace }}/tests/cypress/logs/
${{ github.workspace }}/tests/cypress/reports/
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

> An Apple Maps block for the WordPress block editor (Gutenberg).
[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) [![Release Version](https://img.shields.io/github/release/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/releases/latest) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/maps-block-apple?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/blob/develop/LICENSE.md)
[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/maps-block-apple?label=WordPress) [![GPL-2.0-or-later License](https://img.shields.io/github/license/10up/maps-block-apple.svg)](https://github.com/10up/maps-block-apple/blob/develop/LICENSE.md) [![WordPress Plugin Version](https://img.shields.io/wordpress/plugin/v/maps-block-apple?logo=wordpress&logoColor=FFFFFF&label=Playground%20Demo&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/maps-block-apple/develop/.wordpress-org/blueprints/blueprint.json)

[![E2E test](https://github.com/10up/maps-block-apple/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/maps-block-apple/actions/workflows/cypress.yml) [![Linting](https://github.com/10up/maps-block-apple/actions/workflows/linting.yml/badge.svg)](https://github.com/10up/maps-block-apple/actions/workflows/linting.yml) [![Dependency Review](https://github.com/10up/maps-block-apple/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/maps-block-apple/actions/workflows/dependency-review.yml)

## Overview

Expand All @@ -15,7 +17,7 @@ This plugin integrates Apple's [MapKit JS](https://developer.apple.com/maps/mapk
## Requirements

* PHP 7.4+
* [WordPress](http://wordpress.org/) 5.8+
* [WordPress](http://wordpress.org/) 6.4+
* Due to the requirements applied by Apple to use Apple Maps ([MapkitJS](https://developer.apple.com/maps/mapkitjs/)), Apple Maps for WordPress requires an [Apple Developer](https://developer.apple.com/) [account](https://developer.apple.com/account/) and enrollment within the [Apple Developer Program](https://developer.apple.com/programs/).

## Installation
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"type": "wordpress-plugin",
"homepage": "https://10up.com",
"license": "GPLv2 or later",
"license": "GPL-2.0-or-later",
"authors": [
{
"name": "10up",
Expand Down
6 changes: 3 additions & 3 deletions maps-block-apple.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
* Plugin URI: https://github.com/10up/maps-block-apple
* Description: An Apple Maps block for the WordPress block editor (Gutenberg).
* Version: 1.1.3
* Requires at least: 5.8
* Requires at least: 6.4
* Requires PHP: 7.4
* Author: 10up
* Author URI: https://10up.com
* License: GPLv2 or later
* License URI: http://www.gnu.org/licenses/gpl-2.0.html
* License: GPL-2.0-or-later
* License URI: https://spdx.org/licenses/GPL-2.0-or-later.html
* Text Domain: maps-block-apple
*
* @package tenup\Maps_Block_Apple
Expand Down
Loading

0 comments on commit 72f40b4

Please sign in to comment.