Skip to content
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

Jump to bottom

Fixed APK installation on device after bundling. #8994

Merged
merged 1 commit into from
May 28, 2024
Merged

Fixed APK installation on device after bundling. #8994

merged 1 commit into from
May 28, 2024

Conversation

AGulev
Copy link
Contributor

@AGulev AGulev commented May 28, 2024 •
edited
Loading

Make sure that the correct APK path is used when the editor installs the APK on a device.

Fix #8992

PR checklist

  • Code
    • Add engine and/or editor unit tests.
    • New and changed code follows the overall code style of existing code
    • Add comments where needed
  • Documentation
    • Make sure that API documentation is updated in code comments
    • Make sure that manuals are updated (in github.com/defold/doc)
  • Prepare pull request and affected issue for automatic release notes generator
    • Pull request - Write a message that explains what this pull request does. What was the problem? How was it solved? What are the changes to APIs or the new APIs introduced? This message will be used in the generated release notes. Make sure it is well written and understandable for a user of Defold.
    • Pull request - Write a pull request title that in a sentence summarises what the pull request does. Do not include "Issue-1234 ..." in the title. This text will be used in the generated release notes.
    • Pull request - Link the pull request to the issue(s) it is closing. Use on of the approved closing keywords.
    • Affected issue - Assign the issue to a project. Do not assign the pull request to a project if there is an issue which the pull request closes.
    • Affected issue - Assign the "breaking change" label to the issue if introducing a breaking change.
    • Affected issue - Assign the "skip release notes" is the issue should not be included in the generated release notes.

Example of a well written PR description:

  1. Start with the user facing changes. This will end up in the release notes.
  2. Add one of the GitHub approved closing keywords
  3. Optionally also add the technical changes made. This is information that might help the reviewer. It will not show up in the release notes. Technical changes are identified by a line starting with one of these:
    1. ### Technical changes
    2. Technical changes:
    3. Technical notes:
There was a anomaly in the carbon chroniton propeller, introduced in version 8.10.2. This fix will make sure to reset the phaser collector on application startup.

Fixes #1234

### Technical changes
* Pay special attention to line 23 of phaser_collector.clj as it contains some interesting optimizations
* The propeller code was not taking into account a negative phase.

@AGulev AGulev requested a review from vlaaad May 28, 2024 08:35
AGulev
AGulev commented May 28, 2024
View reviewed changes
editor/src/clj/editor/app_view.clj
@@ -2397,7 +2398,8 @@ If you do not specifically require different script states, consider changing th
(let [game-project (project/get-resource-node project "/game.project" evaluation-context)
package (game-project/get-setting game-project ["android" "package"] evaluation-context)
project-title (game-project/get-setting game-project ["project" "title"] evaluation-context)
apk-path (io/file output-directory project-title (str project-title ".apk"))]
binary-name (BundleHelper/projectNameToBinaryName project-title)
apk-path (io/file output-directory binary-name (str binary-name ".apk"))]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is new 1.8.1 change #8660
Shouldn't be merged until release of the 1.8.1

vlaaad
vlaaad approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@vlaaad vlaaad left a comment

Choose a reason for hiding this comment

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

LGTM!

@AGulev AGulev merged commit 7247f03 into editor-dev May 28, 2024
6 checks passed
@AGulev AGulev deleted the DEFEDIT-8992 branch May 28, 2024 14:10
@AGulev AGulev added the editor Issues related to the Defold editor label Jun 19, 2024
AGulev added a commit that referenced this pull request Jun 25, 2024
@AGulev
fix path to apk (#8994)
80a78a9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vlaaad vlaaad vlaaad approved these changes

Assignees
No one assigned
Labels
editor Issues related to the Defold editor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AGulev @vlaaad