Skip to content

Commit 1045007

Browse files
authored
Merge pull request #19215 from star-e/v3.8.9-google-play
fix(google-play): set PROP_MIN_SDK_VERSION to 24 (#262)
2 parents 64f4c38 + 2da37ed commit 1045007

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

cocos/ui/widget-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ function align (node: Node, widget: Widget): void {
204204
// TODO: type is hack, Change to the type actually used (Node or BaseNode) when BaseNode complete
205205
function visitNode (node: any): void {
206206
const widget = node.getComponent(Widget);
207-
if (widget && widget.enabled && cclegacy.isValid(widget, true)) {
207+
if (widget && widget.enabled) {
208208
if (DEV) {
209209
widget._validateTargetInDEV();
210210
}

cocos/ui/widget.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,9 +852,6 @@ export class Widget extends Component {
852852
}
853853

854854
public onDestroy (): void {
855-
// `onDisable` is skipped when the component was never enabled by the scheduler
856-
// (`IsOnEnableCalled` unset), so unregister here as well.
857-
cclegacy._widgetManager?.remove(this);
858855
this._removeParentEvent();
859856
}
860857

templates/google-play/build/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ android.native.buildOutput=verbose
2727
PROP_COMPILE_SDK_VERSION=36
2828

2929
# Android SDK version that will be used as the earliest version of android this application can run on
30-
PROP_MIN_SDK_VERSION=21
30+
# play-services-oss-licenses, introduced on Feb 2, 2026, requires minSdkVersion 24. https://developers.google.com/android/guides/releases
31+
PROP_MIN_SDK_VERSION=24
3132

3233
# Android SDK version that will be used as the latest version of android this application has been tested on
3334
PROP_TARGET_SDK_VERSION=36

0 commit comments

Comments
 (0)