Skip to content

fix(google-play): set PROP_MIN_SDK_VERSION to 24 (#262) #19215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
star-e merged 2 commits into from
Aug 26, 2026
Merged

fix(google-play): set PROP_MIN_SDK_VERSION to 24 (#262) #19215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a06fcc5
Revert "fix(ui)：keep destroy widgets out of the widget's active list …
star-e Aug 26, 2026
2da37ed
fix(google-play): set PROP_MIN_SDK_VERSION to 24 (#262)
qiuguohua Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos/ui/widget-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
// TODO: type is hack, Change to the type actually used (Node or BaseNode) when BaseNode complete
function visitNode (node: any): void {
const widget = node.getComponent(Widget);
if (widget && widget.enabled && cclegacy.isValid(widget, true)) {
if (widget && widget.enabled) {
if (DEV) {
widget._validateTargetInDEV();
}
Expand All @@ -216,7 +216,7 @@
if (!cclegacy.isValid(node, true)) {
return;
}
activeWidgets.push(widget);

Check failure on line 219 in cocos/ui/widget-manager.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unsafe argument of type `any` assigned to a parameter of type `Widget`
}
const children = node.children;
for (const child of children) {
Expand Down Expand Up @@ -295,7 +295,7 @@
if (!EDITOR) {
const thisOnResized = this.onResized.bind(this);
View.instance.on('canvas-resize', thisOnResized);
screenAdapter.on('window-resize', thisOnResized);

Check failure on line 298 in cocos/ui/widget-manager.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unsafe argument of type `any` assigned to a parameter of type `(...args: any) => void`
}
},
add (widget: Widget): void {
Expand Down
3 changes: 0 additions & 3 deletions cocos/ui/widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
THE SOFTWARE.
*/

import { ccclass, help, executeInEditMode, executionOrder, menu, requireComponent, tooltip, type, editorOnly, editable, serializable, visible } from 'cc.decorator';

Check warning on line 26 in cocos/ui/widget.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

This line has a length of 164. Maximum allowed is 150
import { EDITOR, DEV, EDITOR_NOT_IN_PREVIEW } from 'internal:constants';
import { Component } from '../scene-graph/component';
import { UITransform } from '../2d/framework/ui-transform';
Expand Down Expand Up @@ -852,9 +852,6 @@
}

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

Expand Down
3 changes: 2 additions & 1 deletion templates/google-play/build/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ android.native.buildOutput=verbose
PROP_COMPILE_SDK_VERSION=36

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

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