Skip to content

Fix(package.json) build script, Fix(android) build template#13759

Merged
Legend-Master merged 13 commits into
tauri-apps:devfrom
owjs3901:dev
Jul 8, 2025
Merged

Fix(package.json) build script, Fix(android) build template#13759
Legend-Master merged 13 commits into
tauri-apps:devfrom
owjs3901:dev

Conversation

@owjs3901
Copy link
Copy Markdown
Contributor

@owjs3901 owjs3901 commented Jul 3, 2025

close #13755
close #13757

@owjs3901 owjs3901 requested a review from a team as a code owner July 3, 2025 14:00
@owjs3901 owjs3901 mentioned this pull request Jul 3, 2025
Closed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jul 3, 2025 •
edited
Loading

Package Changes Through 636b344

There are 4 changes which include @tauri-apps/api with patch, tauri-cli with patch, tauri-bundler with patch, tauri-utils with patch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
@tauri-apps/api 2.6.0 2.6.1
tauri-utils 2.5.0 2.5.1
tauri-bundler 2.5.0 2.5.1
tauri-runtime 2.7.0 2.7.1
tauri-runtime-wry 2.7.1 2.7.2
tauri-codegen 2.3.0 2.3.1
tauri-macros 2.3.1 2.3.2
tauri-plugin 2.3.0 2.3.1
tauri-build 2.3.0 2.3.1
tauri 2.6.2 2.6.3
@tauri-apps/cli 2.6.2 2.6.3
tauri-cli 2.6.2 2.6.3

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

@Legend-Master
Copy link
Copy Markdown
Contributor

Legend-Master commented Jul 3, 2025

Since we updated the targetSdk in the template to 35 now, we should probably add #12182 (comment) to the template as well to align the edge to edge behavior on older android versions?

@FabianLars
Copy link
Copy Markdown
Member

FabianLars commented Jul 3, 2025

hmm yeah, probably a good idea

@Legend-Master
Copy link
Copy Markdown
Contributor

Legend-Master commented Jul 4, 2025

Also maybe it's worth bumping the SDK version directly to 36?

@setoelkahfi
Copy link
Copy Markdown
Contributor

setoelkahfi commented Jul 5, 2025 •
edited
Loading

I think you also need to update the Android Gradle Plugin. See https://developer.android.com/build/releases/gradle-plugin#api-level-support

For API level 35, we need at least AGP version 8.6.0.
For API level 36, we need at least AGP version 8.9.1

@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

Ok

@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

Updated!

@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

@FabianLars Check Please

Legend-Master
Legend-Master requested changes Jul 8, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@Legend-Master Legend-Master left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think your commits are still not signed

Also, maybe let's apply #13759 (comment) ?

Comment thread crates/tauri-cli/templates/mobile/android/app/build.gradle.kts Outdated
Comment thread crates/tauri-cli/templates/mobile/android/build.gradle.kts Outdated
Comment thread crates/tauri-cli/templates/mobile/android/gradle/wrapper/gradle-wrapper.properties
@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

@Legend-Master Complete

Legend-Master
Legend-Master previously approved these changes Jul 8, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@Legend-Master Legend-Master left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just sign your commits and we can get it merged 🙃

https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits

Comment thread .changes/update-android-sdk.md Outdated
@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

@Legend-Master Finally I'm done

@Legend-Master
Copy link
Copy Markdown
Contributor

Legend-Master commented Jul 8, 2025

You need to sign your past commits as well, guide here: #11914 (comment) (stealing fabian's comment 🙃)

renovate Bot and others added 11 commits July 8, 2025 16:28
@renovate @owjs3901
chore(deps): update dependency @rollup/plugin-typescript to v12.1.4 (t…
d42c6e3 
…auri-apps#13729)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@owjs3901 @FabianLars
fix(cli/ios): fix CFBundleVersion type (tauri-apps#13743)
b2426a0 
Co-authored-by: devfive <devfive@devfiveui-MacStudio.local>
Co-authored-by: Fabian-Lars <github@fabianlars.de>
@Legend-Master @owjs3901
fix(mock): expose callback functions (tauri-apps#13744)
a33c5d6 
* fix(mock): expose callback functions

* Add change file

* Bumped the wrong package

* Fix end quote in comment
@owjs3901
Update compileSdk targetSdk, Fix build cmd
52482c7
@owjs3901
Add changelog
6469c31
@owjs3901
Update AGP version
2cab831
@owjs3901
Update package.json
2f8ef8e
@owjs3901
Update AGP
4ce2ade
@owjs3901
Update SDK
1d7dbe9
@owjs3901
Update
ab8cdb9
@owjs3901 @Legend-Master
Update .changes/update-android-sdk.md
ba20309 
Co-authored-by: Tony <68118705+Legend-Master@users.noreply.github.com>
@owjs3901
Copy link
Copy Markdown
Contributor Author

owjs3901 commented Jul 8, 2025

Completed according to the procedure

@Legend-Master

@owjs3901 owjs3901 requested a review from Legend-Master July 8, 2025 07:47
Legend-Master
Legend-Master approved these changes Jul 8, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@Legend-Master Legend-Master left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@Legend-Master Legend-Master merged commit 12e3590 into tauri-apps:dev Jul 8, 2025
27 checks passed
@Legend-Master Legend-Master mentioned this pull request Jul 8, 2025
Merged
@github-actions github-actions Bot mentioned this pull request Jul 12, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Legend-Master Legend-Master Legend-Master approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[policy] google android store policy [bug] project setup issue on windows

4 participants

@owjs3901 @Legend-Master @FabianLars @setoelkahfi