Skip to content

Commit

Permalink
Set up environment using Kotlin DSL, refactored code, migrated archit…
Browse files Browse the repository at this point in the history
…ecture
  • Loading branch information
kokoro-aya committed May 24, 2021
1 parent 2443cf3 commit 741d01b
Show file tree
Hide file tree
Showing 78 changed files with 1,214 additions and 3,515 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

97 changes: 0 additions & 97 deletions .idea/artifacts/amatsukaze_jar.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/copyright/copyright_AGPL_amatsukaze.xml

This file was deleted.

7 changes: 7 additions & 0 deletions .idea/copyright/copyright_AGPL_simulatte.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions .idea/simulatte.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions .space.kts

This file was deleted.

19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# amatsukaze
~~A compiler of a home made DSL integrated within a Playground~~
# Simulatte

A Playground server implemented with ANTLR and/or Kotlin DSL.
A Playground server implemented with Kotlin DSL.

In the final release you will be able to choose from using my home made DSL or using Kotlin DSL.
This project is part of the Project ironica.

~~**Please be aware that this project is discontinued has moved to [here](https://github.com/kokoro-aya/shizuku).
The new project is subject to be refactored by introducing a better DSL implementation and a more completed playground
data structure. This repo will therefore be archived and few changes will be committed unless in case or urgency.**~~
Build with

The project is currently under refactoring using the Kotlin DSL in lieu of homemade DSL using ANTLR.
- Kotlin
- Ktor
- Kotlin serialization
- Kotlin Poet
- Ki-Shell

For more information please review [the Wiki](https://github.com/kokoro-aya/amatsukaze/wiki) of this repo.

For download please go to the pages of [Release](https://github.com/kokoro-aya/amatsukaze/releases).
For download please go to the pages of [Release](https://github.com/kokoro-aya/amatsukaze/releases).
30 changes: 12 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2020-2021. kokoro-aya. All right reserved.
* Amatsukaze - A Playground Server implemented with ANTLR or Kotlin DSL
* Simulatte - A Playground Server implemented with Kotlin DSL
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
Expand All @@ -14,40 +14,31 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version "1.5.0"
id 'org.jetbrains.kotlin.plugin.serialization' version "1.5.0"
id 'com.github.johnrengelman.shadow' version '5.2.0'
id 'io.gitlab.arturbosch.detekt' version '1.17.0'
id 'application'
}


group 'org.ironica'
version '1.7.1-SNAPSHOT'
version '2.1.0-SNAPSHOT'

sourceCompatibility = 11

final GRAMMAR_DIR = "gen/src/main"
final LOCAL_GRAMMAR_DIR = "src/main/gen"

sourceSets {
main {
java { srcDirs += GRAMMAR_DIR }
java { srcDirs += LOCAL_GRAMMAR_DIR }
}
}

repositories {
mavenCentral()
maven {
url "https://kotlin.bintray.com/kotlinx"
}
}

mainClassName = 'org.ironica.amatsukaze.app.ApplicationKt'
mainClassName = 'org.ironica.simulatte.app.ApplicationKt'

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-stdlib"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.5.0"
testCompile group: 'junit', name: 'junit', version: '4.12'
// https://mvnrepository.com/artifact/org.antlr/antlr4
implementation "org.antlr:antlr4:4.9.1"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'

compile group: 'org.antlr', name: 'antlr4', version: '4.9.1'

implementation "io.ktor:ktor-server-core:1.5.4"
implementation "io.ktor:ktor-server-netty:1.5.4"
Expand All @@ -56,6 +47,9 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.0"

testImplementation "io.ktor:ktor-server-tests:1.5.4"

implementation group: 'com.squareup', name: 'kotlinpoet', version: '1.8.0'
implementation 'org.jetbrains.kotlinx:ki-shell:0.3.3'
}

compileKotlin {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rootProject.name = 'amatsukaze'
rootProject.name = 'simulatte'

82 changes: 0 additions & 82 deletions src/main/kotlin/org/ironica/amatsukaze/app/Calc.kt

This file was deleted.

Loading

0 comments on commit 741d01b

Please sign in to comment.