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.

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

Optimize much #363

Merged
merged 8 commits into from
Dec 28, 2021
Merged

Optimize much #363

merged 8 commits into from
Dec 28, 2021

Conversation

Goooler
Copy link
Contributor

@Goooler Goooler commented Dec 26, 2021

  • Update dependencies & Replace jcenter.
  • Add .gitattributes & .editorconfig.
  • Code cleanups.
  • Add CI for building.

@ikarus23
Copy link
Owner

Thank you! I will have a closer look and give some feedback in the respective commit. A lot of my feedback will probably be questions, because I'm no Android developer guru like you ;)

@Goooler
Copy link
Contributor Author

Goooler commented Dec 28, 2021

No problem.

Copy link
Owner

@ikarus23 ikarus23 left a comment

Choose a reason for hiding this comment

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

I have no experience with github CI. I guess it will work since you have tested it :)
There is a new line missing at the end of the file.

Edit: Oh, it shows up here. I hoped it would be pinned to a specific commit. (in this case f5991cb)

Copy link
Owner

@ikarus23 ikarus23 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 in most places, but some small changes are required.

key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle/wrapper/gradle-wrapper.properties', '**/buildSrc/src/main/kotlin/**.kt') }}
- name: Build
working-directory: ${{ env.PROJECT_PATH }}
run: ./gradlew --parallel assembleRelease
Copy link
Owner

Choose a reason for hiding this comment

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

New line is missing at the end of the file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added.

// MIFARE Plus EV1 2K/4K SL1
return -1;
}
return -1;
Copy link
Owner

Choose a reason for hiding this comment

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

I did this to make the code more readable and closer to the datasheet linked in an above comment.
I don't like the optimized version. It is not readable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted.

@@ -4,7 +4,6 @@ plugins {

android {
compileSdkVersion 31
buildToolsVersion '31.0.0'
Copy link
Owner

Choose a reason for hiding this comment

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

Is safe to remove this? What build tools version will be used when it's not declared?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Latest.

@@ -1,79 +1,129 @@
#!/usr/bin/env bash
Copy link
Owner

Choose a reason for hiding this comment

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

Why replace it with just /bin/sh? The old format made more sense to me.
Did you do the big grade update yourself or is there an automatic tool for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Generate gradle wrapper by running ./gradlew wrapper.

@Goooler
Copy link
Contributor Author

Goooler commented Dec 28, 2021

CI passed on my forked repo.

image

@ikarus23 ikarus23 merged commit fef305e into ikarus23:master Dec 28, 2021
@Goooler Goooler deleted the ci branch December 28, 2021 16:24
@ikarus23
Copy link
Owner

There was a big jar file at Mifare Classic Tool/gradle/wrapper/gradle-wrapper.jar. Should that be really part of the repo?

@ikarus23
Copy link
Owner

Well, I guess it should. At least it was there before. Just got bigger :)

@Goooler
Copy link
Contributor Author

Goooler commented Dec 28, 2021

Yeah, you can learn the gradle project structure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants