Skip to content

Commit

Permalink
Proofread
Browse files Browse the repository at this point in the history
  • Loading branch information
ligee committed Feb 18, 2020
1 parent e995fd8 commit 302f761
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

# Kotlin scripting examples

This repository contains example projects and individual scripts, as well es links to the external examples
This repository contains example projects and individual scripts, as well as links to the external examples
demonstrating Kotlin Scripting functionality and API usage.

If you know good examples of the Kotlin scripting API usage, not mentioned here, please submit an issue or a pull
request with the link and short description.

## Examples in this repository

The complete project could be compiled with gradle, as well as imported e.g. in IntelliJ IDEA.
The complete project could be compiled with Gradle, as well as imported e.g. in IntelliJ IDEA.

The individual example projects are mostly independent and could be copied and reused independently, but build files
should be adopted accordingly, mostly to supply required Kotlin version properties and setup inter-project dependencies
Expand Down
2 changes: 1 addition & 1 deletion jvm/basic/jvm-embeddable-host/EmbeddableCompiler.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Kotlin Scripting Examples: Scripting Host with Kotlin Compiler Embeddable

This example demonstrates the that uses the same definition as in the
This example demonstrates the usage of the same definition as in the
[Simple script definition example](../jvm-simple-script/SimpleScript.md) but uses the embeddable version of the
Kotlin compiler. The necessity of using embeddable compiler may arise when the dependencies that are packed into
the `kotlin-compiler` jar, could conflict with the dependencies used by the host.
2 changes: 1 addition & 1 deletion jvm/basic/jvm-maven-deps/MavenDeps.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Kotlin Scripting Examples: Script with Dynamic dependencies from Maven

This example demonstrates the [script definition](script/) and appropriate [scripting host ](host/) that implements
support for dynamic dependencies from Maven repositories usage, so une can write a script:
support for dynamic dependencies from Maven repositories usage, so one can write a script:
```kotlin
@file:DependsOn("junit:junit:4.11")
org.junit.Assert.assertTrue(true)
Expand Down
2 changes: 1 addition & 1 deletion jvm/basic/jvm-simple-script/SimpleScript.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Kotlin Scripting Examples: Simple Script Definition

This example demonstrates creation of the [simple script definition project](script/) and simple
This example demonstrates the creation of the [simple script definition project](script/) and simple
[scripting host project](host/) that uses the definition.
6 changes: 3 additions & 3 deletions jvm/main-kts/MainKts.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

# Kotlin Scripting Examples: `kotlin-main-kts` usages

Scripts demonstrating the usage of the `kotlin-main-kts` script definition jar, distributied with the Kotlin compiler
and IntelliJ plugin.
Scripts demonstrating the usage of the `kotlin-main-kts` script definition jar, distributed with the Kotlin compiler
and the IntelliJ plugin.

*See also [simplified implementation in this repository](../simple-main-kts/SimpleMainKts.md)*

Expand Down Expand Up @@ -44,7 +44,7 @@ provided that the shebang line is added to the script and works in the given OS

### Caching

The compiled scripts are cashed to the directory defined by an environmen variable `KOTLIN_MAIN_KTS_COMPILED_SCRIPTS_CACHE_DIR`
The compiled scripts are cashed to the directory defined by an environment variable `KOTLIN_MAIN_KTS_COMPILED_SCRIPTS_CACHE_DIR`
*(`$TEMP/main.kts.compiled.cache` by default)*, and if the script is not changed, the compiled one is executed from the cache.

### IntelliJ support
Expand Down
4 changes: 2 additions & 2 deletions jvm/simple-main-kts/SimpleMainKts.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The script definition implementation demonstrates many aspects of the script def
scripting API usage, in particular:
- refinement of the compilation configuration with the parameters passed to the annotations
- dynamic script dependencies resolved via ivy library
- import scripts with possibility of sharing instances (diamond-shaped import)
- compilation cache, where cached compiled script are saved as executable jars
- import scripts with the possibility of sharing instances (diamond-shaped import)
- compilation cache, where cached compiled scripts are saved as executable jars
- discovery file configuration, that could be used with IntelliJ IDEA and command-line compiler

and others.
Expand Down

0 comments on commit 302f761

Please sign in to comment.