-
Notifications
You must be signed in to change notification settings - Fork 111
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
Enable using Kotlin in Ion Java #488
Merged
+317
−274
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
491657f
Update build to use Kotlin
popematt 5054674
Rewrite a class in Kotlin
popematt 3ec57d9
Fix ktlint violations
popematt 1a26c9e
Fixes gradle task dependencies
popematt 225b1f5
Fix build logic and proguard rules
popematt 3adbb76
Update config/proguard/rules.pro
popematt 4689ee9
Adds suggested changes
popematt 59b5617
Merge branch 'master' into use-kotlin
popematt 6cae03f
Merge branch 'master' into use-kotlin
popematt 2a193e7
Update build.gradle.kts
popematt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
|
||
# ion-java | ||
## Dependency License Report | ||
|
||
## Apache License, Version 2.0 | ||
|
||
**1** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` | ||
> - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) | ||
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) | ||
**2** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.9.0` | ||
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) | ||
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) | ||
**3** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.9.0` | ||
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) | ||
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# See [TODO] | ||
popematt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
-keep class !com.amazon.ion.shaded_.** { *; } | ||
-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod | ||
-dontoptimize | ||
-dontobfuscate | ||
-dontwarn java.sql.Timestamp |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the purpose of this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If e.g. Java 17 task fails, it won't cancel the Java 11 task. I added it earlier on when we were still using JDK 8 and JDK 11, and there legitimately were reasons why it might fail for one and succeed for the other. I don't know if that's still possible between JDK 11 and JDK 17, but these tasks are relative short (matter of minutes) so if the task is already running why bother cancelling it? Just let it run.