-
Notifications
You must be signed in to change notification settings - Fork 64
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
Kotlin support #356
Merged
Merged
Kotlin support #356
Changes from 1 commit
Commits
Show all changes
115 commits
Select commit
Hold shift + click to select a range
15e7691
Ignore idea config files
oowekyala 49cc63a
Configure kotlin compiler alongside java
oowekyala 0827336
wip convert a file to kotlin
oowekyala d279963
Port another
oowekyala 4178100
Generate Xtend sources before kotlin compilation
oowekyala c92b19e
Revert "Port another"
oowekyala 8388a3d
Rewrite kotlin -> java
oowekyala f769d48
Java -> xtend
oowekyala db430df
Minor refactoring
oowekyala 1f2cc68
Port one leaf of the dependency graph to kotlin
oowekyala 206a6d4
Try to port another
oowekyala 235077d
Fix warnings
oowekyala 619e44c
Port LFGlobalScopeProvider
oowekyala bd26d88
Add basic extensions taken from ASTUtils
oowekyala 5a44334
Revert "Port LFGlobalScopeProvider"
oowekyala e7bdd62
Use new extensions
oowekyala 166eb6e
Try to update LFGenerator
oowekyala 1bfbc83
Java -> kotlin
oowekyala 244f5ce
Let Xtext create Java files, not Xtend files.
lhstrh 814e4cf
Beginning to port auto-gen files to Java.
lhstrh dbe4c2d
Remove redundant files.
lhstrh 9911f4c
Start a kotlin generator base
oowekyala d3a238a
Merge remote-tracking branch 'origin/kotlin-with-gradle' into kotlin-…
oowekyala 5920166
Finish porting KtGeneratorBase
oowekyala a55bcbc
More things from ASTUtils
oowekyala ad908e4
Merge remote-tracking branch 'origin/distributed-cycles' into kotlin-…
oowekyala 48f9127
Commit new files
oowekyala b299a3b
Updated generated stubs in ide package.
lhstrh cd67ced
Addressed warning.
lhstrh 502c229
Add kotlin and ajdt plugins to oomph
oowekyala fa42cc0
Cleanup target
oowekyala 380061d
Finish updating eclipse files
oowekyala d4057ef
Merge remote-tracking branch 'origin/kotlin-with-gradle' into kotlin-…
oowekyala c98471f
Continue porting KtGeneratorBase
oowekyala d835e01
Some more progress
oowekyala eae3522
Introduce supertype to both generators
oowekyala efc721f
Merge remote-tracking branch 'origin/distributed-cycles' into kotlin-…
oowekyala 2dd37a7
Merge remote-tracking branch 'origin/master' into kotlin-with-gradle
oowekyala 4ba2bfc
Add gradle task to remove files forced on us by Xtext
oowekyala 43e9a41
Remove some kotlin files (KtGeneratorBase)
oowekyala 588a782
Merge remote-tracking branch 'origin/distributed-cycles' into kotlin-…
oowekyala 3f61992
Remove parts of AstExtensions.kt
oowekyala 24b630a
Cleanups
oowekyala e60f362
Merge branch 'distributed-cycles' into kotlin-with-gradle
lhstrh 96ac783
Fix guice bug
oowekyala f6007ef
Merge remote-tracking branch 'origin/kotlin-with-gradle' into kotlin-…
oowekyala 6f2ba07
Merge remote-tracking branch 'origin/distributed-cycles' into kotlin-…
oowekyala f33342e
Merge remote-tracking branch 'origin/master' into kotlin-with-gradle
oowekyala a3cfe8c
Fix merge conflict on .gitignore
lhstrh f327192
Merge branch 'master' into kotlin-with-gradle
oowekyala 7e20f14
Fix clean task
oowekyala c316c25
Merge branch 'master' into kotlin-with-gradle
oowekyala a628c5b
Fix merge conflict in eclipse file
oowekyala 537bd1c
Minor cleanup
oowekyala 3ee41fb
Merge branch 'master' into kotlin-with-gradle
oowekyala 8fbf35f
Fix bug with Jacoco and kotlin 1.5.0
oowekyala 9ff6764
build: Make maven support kotlin
oowekyala 2a897e6
build: Fix junit 4 problem another way
oowekyala b03a8b2
build: Fix another wrong usage of junit 4
oowekyala 29ebc6b
Merge branch 'master' into kotlin-with-gradle
cmnrd 8d7ee03
[gradle] Fixup clean task once more
oowekyala cca6fdc
oomph: Adjusted target platform to include kotlin plugin
a-sr 7eb9d40
Commit LFStandaloneSetup
oowekyala 1665f76
Add kotlin osgi bundle to manifest
oowekyala 8196527
Add src-gen, xtend-gen to clean task
oowekyala 027f0dc
Convert xtend in web module to kotlin/java
oowekyala 74ff692
Merge branch 'master' into kotlin-with-gradle
oowekyala a5d3623
Revert some changes
oowekyala 39f0816
Upgrade kotlin to 1.5.0
oowekyala cbd34ac
Test converting standalone setup to kotlin
oowekyala 4c0f025
Use kotlin OSGI bundle directly
oowekyala 4baf706
Merge branch 'master' into kotlin-with-gradle
lhstrh a35bd10
ASTUtils: bugfix, search all reactor superclasses recursively
cmnrd fb5d913
Also rename function
oowekyala caae126
Use kotlin 1.5.10
oowekyala 4853000
Remove gitignore for LFParsingTest
oowekyala 24d73cd
Put xtext cleanup in a doLast
oowekyala d9699f9
Refresh eclipse files
oowekyala 82bee03
Update osgi bundle version in manifest
oowekyala b498330
Merge branch 'master' into kotlin-with-gradle
cmnrd 3722fa2
Merge remote-tracking branch 'upstream/master' into kotlin-with-gradle
oowekyala 712a5d0
Merge remote-tracking branch 'upstream/kotlin-with-gradle' into kotli…
oowekyala dbdaf24
Ignore some files generated by the build
oowekyala f515c56
Fix the RCA built with mvn (missing kotlin dep)
oowekyala e673e57
Merge remote-tracking branch 'upstream/master' into kotlin-with-gradle
oowekyala 1bc76c6
Merge branch 'master' into kotlin-with-gradle
oowekyala 0dc42ea
Merge branch 'master' into kotlin-with-gradle
lhstrh df73dec
Merge branch 'master' into kotlin-with-gradle
oowekyala d8fa1fc
Merge remote-tracking branch 'upstream/kotlin-with-gradle' into kotli…
oowekyala b38bfcf
Use bundled-compiler from eclipse project
oowekyala 2c88bac
Commit eclipse files
oowekyala c0cc5e6
Fix maven build, RCA ok
oowekyala 589b3b3
Revert "Commit eclipse files"
cmnrd e5fc5da
Revert "Refresh eclipse files"
cmnrd 1ed49cf
add xtend-gen directories to prevent build errors
cmnrd 529918a
remove unused xtend-gen directories
cmnrd efa2903
Change default target
oowekyala 24c2bd3
add eclipse files after 'Refresh Gradle Project'
cmnrd c1fe4be
oomph: Added weaving features to target platform
a-sr 7f9767d
Merge branch 'master' into kotlin-with-gradle
cmnrd 69c424a
partially revert commit 4ba2bfce
cmnrd c1ebd32
fix LFRuntimeModule and LFGenerator
cmnrd 89eed91
revert LFScopeProvider to xtend
cmnrd dcfa23d
Revert "Port one leaf of the dependency graph to kotlin"
cmnrd e041bf8
revert LFStandaloneSetup to java
cmnrd 9b86ca5
Revert "Convert xtend in web module to kotlin/java"
cmnrd 944f8fb
add AbstractLinguaFrancaWebModule
cmnrd cc5c2e4
add missing breaks...
cmnrd 461758f
oomph: remove weaving features
cmnrd 8e20e30
Merge branch 'master' into kotlin-with-gradle
cmnrd 0ef09e6
don't delete generated files in maven and gradle builds
cmnrd 43045bf
provide java stubs so that they are not generated from xtext
cmnrd e1422a2
src-gen seems to be not needed anymore
cmnrd 7134d2c
Add gradle task to run LFC
oowekyala 7662fab
Removed eclipse project information of root folder to fix oomph setup
a-sr 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
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.
Interesting. Do you know that the
lfc
script is capable of something similar? If you runlfc -r
, it rebuilds itself via gradle before running.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.
Ah ok I didn't know. I added the gradle task to be able to run & debug it from intellij, I'm not sure it would be possible with a bash script