From 771bad2481bb2cd1b297c124d10346e5ceb5e011 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Fri, 30 Oct 2026 10:05:13 +0000 Subject: [PATCH 1/2] Use the mobile 4.7 and mobile-ui 0.9 releases The app goes back to tagged versions now that everything it was waiting for has been released. nativephp/mobile requires ^4.7 and locks 4.7.0, and nativephp/mobile-ui requires ^0.9 and locks 0.9.0. Both used to be dev-main with aliases. Only those two packages change in the lock. Each tag is five commits past the old dev-main lock. 4.7.0 keeps deep link paths percent-encoded until PHP decodes them, and both add opt-in validation for native screens, which the app doesn't use yet. The mobile-air VCS repo is gone because Packagist has 4.7.0. The mobile-ui one stays: Packagist hasn't synced that package since 4 October and doesn't list 0.9.0. The README note about the combined branches was out of date and is gone. Co-Authored-By: Claude Opus 5.5 --- README.md | 12 ------- composer.json | 8 ++--- composer.lock | 96 +++++++++++++++------------------------------------ 3 files changed, 29 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index abab00ea..b0f04802 100644 --- a/README.md +++ b/README.md @@ -38,18 +38,6 @@ composer setup `nativephp/mobile-secure-storage` is a paid plugin from `plugins.nativephp.com`, so `composer install` needs your NativePHP plugin credentials. See below if you don't have access to the plugin. -For now the app tracks unreleased branches, which Composer pulls straight from GitHub: - -- `nativephp/mobile` on `combined/dev-null-app`, a branch just for this app. It's `feat/custom-icons`, which adds custom SVG icons ([NativePHP/mobile-air#544](https://github.com/NativePHP/mobile-air/pull/544)), plus the fix that stops the keyboard-dismiss tap swallowing taps on UIKit controls such as `native:toggle` and the Sign in with Apple button ([NativePHP/mobile-air#545](https://github.com/NativePHP/mobile-air/pull/545)). -- `nativephp/mobile-ui` on `combined/dev-null-app`, a branch just for this app. It's `feat/custom-icons` ([NativePHP/mobile-ui#132](https://github.com/NativePHP/mobile-ui/pull/132)) plus: - - opening the iOS pager at its start page ([#131](https://github.com/NativePHP/mobile-ui/pull/131)) and running a swiping pager's lists under the tab bar ([#134](https://github.com/NativePHP/mobile-ui/pull/134)), - - a pager that reports its page once the swipe settles ([#135](https://github.com/NativePHP/mobile-ui/pull/135)) and draws its tabs natively ([#136](https://github.com/NativePHP/mobile-ui/pull/136)), - - button variants named after a theme colour ([#137](https://github.com/NativePHP/mobile-ui/pull/137)), - - a sticky header for lists ([#138](https://github.com/NativePHP/mobile-ui/pull/138)), - - a pager header that scrolls with the page showing ([#139](https://github.com/NativePHP/mobile-ui/pull/139)). - -Once those are released, the app goes back to tagged versions and the combined branches can be deleted. - ### Without plugin credentials ```sh diff --git a/composer.json b/composer.json index adfa159b..993f36df 100644 --- a/composer.json +++ b/composer.json @@ -11,10 +11,6 @@ ], "license": "MIT", "repositories": [ - { - "type": "vcs", - "url": "https://github.com/NativePHP/mobile-air" - }, { "type": "vcs", "url": "https://github.com/NativePHP/mobile-ui" @@ -35,7 +31,7 @@ "laravel/boost": "^2.0", "laravel/framework": "^13.0", "laravel/tinker": "^3.0", - "nativephp/mobile": "dev-main as 4.6.1", + "nativephp/mobile": "^4.7", "nativephp/mobile-browser": "^1.2", "nativephp/mobile-camera": "^1.1", "nativephp/mobile-clipboard": "^1.0", @@ -43,7 +39,7 @@ "nativephp/mobile-microphone": "^1.2", "nativephp/mobile-secure-storage": "^1.1", "nativephp/mobile-share": "^1.1", - "nativephp/mobile-ui": "dev-main as 0.8.0", + "nativephp/mobile-ui": "^0.9", "s2br/nativephp-mobile-splashscreen": "^1.4", "victorycodedev/toastkit": "dev-fix/android-toasts-above-sheets as 1.4.0" }, diff --git a/composer.lock b/composer.lock index a77e4949..072908e3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "86b6ccf3a666125ed5bd845be0b1b96f", + "content-hash": "ed1be716d111b35c5cd50b15efbb60f8", "packages": [ { "name": "bacon/bacon-qr-code", @@ -2719,16 +2719,16 @@ }, { "name": "nativephp/mobile", - "version": "dev-main", + "version": "4.7.0", "source": { "type": "git", "url": "https://github.com/NativePHP/mobile-air.git", - "reference": "9da9a848ac70140fd5c248c53dd921f70e13381c" + "reference": "0d7e2e6509b1a0514726e67016fecade5e9137b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NativePHP/mobile-air/zipball/9da9a848ac70140fd5c248c53dd921f70e13381c", - "reference": "9da9a848ac70140fd5c248c53dd921f70e13381c", + "url": "https://api.github.com/repos/NativePHP/mobile-air/zipball/0d7e2e6509b1a0514726e67016fecade5e9137b2", + "reference": "0d7e2e6509b1a0514726e67016fecade5e9137b2", "shasum": "" }, "require": { @@ -2753,22 +2753,21 @@ "nativephp/mobile-system": "*" }, "require-dev": { - "larastan/larastan": "^2.0", + "larastan/larastan": "^3.0", "laravel/pint": "^1.0", - "nunomaduro/collision": "^7.9", - "orchestra/testbench": "^8.18", - "pestphp/pest": "^2.7|^3.0|^4.0", - "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", + "nunomaduro/collision": "^8.0", + "orchestra/testbench": "^10.0|^11.0", + "pestphp/pest": "^3.0", + "pestphp/pest-plugin-arch": "^3.0", + "pestphp/pest-plugin-laravel": "^3.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0", - "spatie/laravel-ray": "^1.26" + "phpstan/phpstan-deprecation-rules": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "spatie/laravel-ray": "^1.40" }, "suggest": { "ext-zip": "Required by native:install to validate and extract the downloaded Android PHP binary archives" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -2778,40 +2777,14 @@ } }, "autoload": { - "psr-4": { - "Native\\Mobile\\": "src/" - }, "files": [ "src/helpers.php" - ] - }, - "autoload-dev": { + ], "psr-4": { - "Tests\\": "tests/" + "Native\\Mobile\\": "src/" } }, - "scripts": { - "qa": [ - "@composer format", - "@composer analyse", - "@composer test" - ], - "post-autoload-dump": [ - "@php ./vendor/bin/testbench package:discover --ansi" - ], - "analyse": [ - "vendor/bin/phpstan analyse" - ], - "test": [ - "vendor/bin/pest" - ], - "test-coverage": [ - "vendor/bin/pest --coverage" - ], - "format": [ - "vendor/bin/pint" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2836,10 +2809,10 @@ "nativephp" ], "support": { - "source": "https://github.com/NativePHP/mobile-air/tree/main", - "issues": "https://github.com/NativePHP/mobile-air/issues" + "issues": "https://github.com/NativePHP/mobile-air/issues", + "source": "https://github.com/NativePHP/mobile-air/tree/4.7.0" }, - "time": "2026-10-29T09:23:33+00:00" + "time": "2026-10-29T17:31:02+00:00" }, { "name": "nativephp/mobile-browser", @@ -3228,20 +3201,20 @@ }, { "name": "nativephp/mobile-ui", - "version": "dev-main", + "version": "0.9.0", "source": { "type": "git", "url": "https://github.com/NativePHP/mobile-ui.git", - "reference": "d7eca1245efbe1d0afdf19811b8ffed416b25bff" + "reference": "9cee87cbc676a6500247bec99be5d19f633a04e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/NativePHP/mobile-ui/zipball/d7eca1245efbe1d0afdf19811b8ffed416b25bff", - "reference": "d7eca1245efbe1d0afdf19811b8ffed416b25bff", + "url": "https://api.github.com/repos/NativePHP/mobile-ui/zipball/9cee87cbc676a6500247bec99be5d19f633a04e9", + "reference": "9cee87cbc676a6500247bec99be5d19f633a04e9", "shasum": "" }, "require": { - "nativephp/mobile": "^4.6", + "nativephp/mobile": "^4.7", "php": "^8.3" }, "require-dev": { @@ -3249,7 +3222,6 @@ "orchestra/testbench": "^10.0", "pestphp/pest": "^3.0" }, - "default-branch": true, "type": "nativephp-plugin", "extra": { "laravel": { @@ -3288,7 +3260,7 @@ ], "description": "Native SwiftUI and Jetpack Composer components for NativePHP", "support": { - "source": "https://github.com/NativePHP/mobile-ui/tree/main", + "source": "https://github.com/NativePHP/mobile-ui/tree/0.9.0", "issues": "https://github.com/NativePHP/mobile-ui/issues" }, "funding": [ @@ -3297,7 +3269,7 @@ "url": "https://nativephp.com/sponsor" } ], - "time": "2026-10-29T13:48:57+00:00" + "time": "2026-10-29T17:44:09+00:00" }, { "name": "nesbot/carbon", @@ -11446,18 +11418,6 @@ } ], "aliases": [ - { - "package": "nativephp/mobile", - "version": "dev-main", - "alias": "4.6.1", - "alias_normalized": "4.6.1.0" - }, - { - "package": "nativephp/mobile-ui", - "version": "dev-main", - "alias": "0.8.0", - "alias_normalized": "0.8.0.0" - }, { "package": "victorycodedev/toastkit", "version": "dev-fix/android-toasts-above-sheets", @@ -11467,8 +11427,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "nativephp/mobile": 20, - "nativephp/mobile-ui": 20, "victorycodedev/toastkit": 20 }, "prefer-stable": true, From 70aefac4aa7c94714aee4736384c639090a0ca17 Mon Sep 17 00:00:00 2001 From: Simon Hamp Date: Fri, 30 Oct 2026 10:09:08 +0000 Subject: [PATCH 2/2] Install mobile-ui from Packagist now that it lists 0.9.0 Packagist has caught up with mobile-ui, so the GitHub repo entry isn't needed any more. The lock keeps the same 0.9.0 commit. Only the package metadata changes to Packagist's copy. Co-Authored-By: Claude Opus 5.5 --- composer.json | 4 ---- composer.lock | 22 ++++++---------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 993f36df..45604ed8 100644 --- a/composer.json +++ b/composer.json @@ -11,10 +11,6 @@ ], "license": "MIT", "repositories": [ - { - "type": "vcs", - "url": "https://github.com/NativePHP/mobile-ui" - }, { "type": "vcs", "url": "https://github.com/simonhamp/toastkit" diff --git a/composer.lock b/composer.lock index 072908e3..05af7f42 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ed1be716d111b35c5cd50b15efbb60f8", + "content-hash": "ef8c20efc81906f3a73bb08333d5c82e", "packages": [ { "name": "bacon/bacon-qr-code", @@ -3238,17 +3238,7 @@ "Native\\Mobile\\UI\\": "src/" } }, - "scripts": { - "test": [ - "pest" - ], - "lint": [ - "pint" - ], - "lint:test": [ - "pint --test" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3260,13 +3250,13 @@ ], "description": "Native SwiftUI and Jetpack Composer components for NativePHP", "support": { - "source": "https://github.com/NativePHP/mobile-ui/tree/0.9.0", - "issues": "https://github.com/NativePHP/mobile-ui/issues" + "issues": "https://github.com/NativePHP/mobile-ui/issues", + "source": "https://github.com/NativePHP/mobile-ui/tree/0.9.0" }, "funding": [ { - "type": "other", - "url": "https://nativephp.com/sponsor" + "url": "https://nativephp.com/sponsor", + "type": "other" } ], "time": "2026-10-29T17:44:09+00:00"