Skip to content

Commit 11cdc32

Browse files
committed
Framework improvement.
1 parent e7a5ecd commit 11cdc32

File tree

57 files changed

+103
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+103
-137
lines changed
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ plugins {
77
id("maven-publish")
88
}
99

10-
repositories {
11-
}
12-
1310
dependencies {
1411
compileOnly("org.apache.commons:commons-lang3:3.10")
1512
compileOnly("com.google.code.gson:gson:2.8.6")
1613
compileOnly("org.slf4j:slf4j-log4j12:1.7.30")
1714

1815
implementation("org.jetbrains.kotlin:kotlin-script-util:${rootProject.extra.get("kotlinVersion")}")
1916
implementation("org.jetbrains.kotlin:kotlin-compiler:${rootProject.extra.get("kotlinVersion")}")
20-
implementation("commons-cli:commons-cli:1.4")
2117

2218
implementation("commons-io:commons-io:2.7")
2319
implementation("me.scoretwo:commons-syntaxes:${rootProject.extra.get("commonsVersion")}")
@@ -28,12 +24,10 @@ dependencies {
2824

2925
tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
3026
dependencies {
31-
include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
32-
include(dependency("org.jetbrains.kotlin:kotlin-script-util:${rootProject.extra.get("kotlinVersion")}"))
33-
include(dependency("org.jetbrains.kotlin:kotlin-compiler:${rootProject.extra.get("kotlinVersion")}"))
27+
exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
28+
exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib-common"))
3429

35-
include(dependency("commons-io:commons-io:2.7"))
36-
include(dependency("commons-cli:commons-cli:1.4"))
30+
exclude(dependency("commons-io:commons-io:2.7"))
3731

3832
include(dependency("me.scoretwo:commons-syntaxes:${rootProject.extra.get("commonsVersion")}"))
3933
include(dependency("me.scoretwo:commons-command:${rootProject.extra.get("commonsVersion")}"))

common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/config/Config.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/config/Config.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ProcessException.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ProcessException.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptException.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptException.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptNotFound.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptNotFound.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/ExpansionManager.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/ExpansionManager.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
package me.scoretwo.fastscript.api.expansion
22

33
import me.scoretwo.fastscript.expansion.javascript.JavaScriptExpansion
4-
import me.scoretwo.fastscript.expansion.kotlinscript.KotlinScriptExpansion
5-
import java.io.File
6-
import java.io.IOException
7-
import java.net.URLClassLoader
8-
import java.util.jar.JarEntry
9-
import java.util.jar.JarInputStream
104

115
class ExpansionManager {
126

137
val expansions = mutableSetOf<FastScriptExpansion>()
148

159
init {
16-
register(KotlinScriptExpansion())
1710
register(JavaScriptExpansion())
1811
}
1912

common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/FastScriptExpansion.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/FastScriptExpansion.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/format/FormatHeader.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/format/FormatHeader.kt

File renamed without changes.

common/src/main/kotlin/me/scoretwo/fastscript/api/language/Language.kt renamed to FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/language/Language.kt

File renamed without changes.

0 commit comments

Comments
 (0)