Merge pull request #1126 from skaut/version-1.1.30

Version 1.1.30
skaut · Dec 22, 2024 · b89cefd · b89cefd
2 parents ee2e1ae + c70d8c1
commit b89cefd
Show file tree

Hide file tree

Showing 8 changed files with 1,666 additions and 1,750 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -4,7 +4,7 @@ on:
     branches: "*"
   pull_request:
 env:
-  php-version: 8.1
+  php-version: 8.2
   cache-version: 1
 jobs:
   platform-check:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
     tags:
       - "*"
 env:
-  php-version: 8.1
+  php-version: 8.2
   cache-version: 1
 jobs:
   build:

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
     "phpmd/phpmd": "^2.10",
     "phpcompatibility/phpcompatibility-wp": "^2.1",
     "wp-coding-standards/wpcs": "^3.0",
-    "humbug/php-scoper": "^0.18.1",
+    "humbug/php-scoper": "^0.18.9 <0.18.10",
     "skaut/wordpress-stubs": "^2.1",
     "phpstan/phpstan": "^2.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^1.0"

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "skautis-integration",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "A WordPress plugin for integration with SkautIS",
   "keywords": [
     "wordpress",

diff --git a/src/php/skautis-integration.php b/src/php/skautis-integration.php
@@ -11,7 +11,7 @@
 Plugin Name:       skautIS integration
 Plugin URI:        https://github.com/skaut/skautis-integration
 Description:       Integrace WordPressu se skautISem
-Version:           1.1.29
+Version:           1.1.30
 Author:            Junák - český skaut
 Author URI:        https://github.com/skaut
 License:           GPLv3
@@ -30,7 +30,7 @@
 define( 'SKAUTIS_INTEGRATION_PATH', plugin_dir_path( __FILE__ ) );
 define( 'SKAUTIS_INTEGRATION_URL', plugin_dir_url( __FILE__ ) );
 define( 'SKAUTIS_INTEGRATION_NAME', 'skautis-integration' );
-define( 'SKAUTIS_INTEGRATION_VERSION', '1.1.29' );
+define( 'SKAUTIS_INTEGRATION_VERSION', '1.1.30' );
 
 require __DIR__ . '/class-skautis-integration.php';
 

diff --git a/src/txt/readme.txt b/src/txt/readme.txt
@@ -4,7 +4,7 @@ Tags: skaut, multisite, shortcode, skautIS, registrace
 Requires at least: 5.0
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 1.1.29
+Stable tag: 1.1.30
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -38,6 +38,9 @@ Plugin po aktivaci bude vyžadovat APP ID, bez toho nebude plugin vůbec fungova
 
 == Changelog ==
 
+= 1.1.30 =
+* Fixed errors in rule editor
+
 = 1.1.29 =
 * Support for WordPress 6.6
 * DataTables updates
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
         tags:
           - "*"
     env:
-      php-version: 8.1
+      php-version: 8.2
       cache-version: 1
     jobs:
       build:
@@ Expand Down @@