Skip to content

Commit 9d13362

Browse files
authored
Merge pull request #14 from sparsetech/feat/cross-platform
Provide build configurations for Scala 2.13 and Scala Native
2 parents e7d674a + 89db8a1 commit 9d13362

File tree

6 files changed

+134
-45
lines changed

6 files changed

+134
-45
lines changed

.drone.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ kind: pipeline
22
name: default
33
steps:
44
- name: test
5-
image: tindzk/seed:0.1.4
5+
image: tindzk/seed:0.1.5
66
commands:
77
- blp-server &
8-
- seed bloop
8+
- seed --build=build211.toml bloop
9+
- sleep 5 # Synchronise analysis.bin files, otherwise rm might fail
10+
- bloop compile translit-native
11+
- bloop test translit-jvm translit-js
12+
- seed --build=build212.toml bloop
13+
- bloop test translit-jvm translit-js
14+
- sleep 5
15+
- seed bloop --build=build213.toml
916
- bloop test translit-jvm translit-js

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[![Build Status](http://ci.sparse.tech/api/badges/sparsetech/translit-scala/status.svg)](http://ci.sparse.tech/sparsetech/translit-scala)
33
[![Maven Central](https://img.shields.io/maven-central/v/tech.sparse/translit-scala_2.12.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22tech.sparse%22%20AND%20a%3A%22translit-scala_2.12%22)
44

5-
translit-scala is a transliteration library for Scala and Scala.js. It implements transliteration rules for Slavic languages. It supports converting texts from the Latin to the Cyrillic alphabet and vice-versa.
5+
translit-scala is a transliteration library for the Scala platform. It implements transliteration rules for Slavic languages. It supports converting texts from the Latin to the Cyrillic alphabet and vice-versa.
66

77
## Features
88
* Supported languages
@@ -14,14 +14,15 @@ translit-scala is a transliteration library for Scala and Scala.js. It implement
1414
* Only letters from the US keyboard are used
1515
* All common letters can be typed with a single keystroke
1616
* Convenience shortcuts are provided
17-
* Cross-platform support (JVM, Scala.js)
17+
* Cross-platform support (JVM, Scala.js, Scala Native)
1818
* Zero dependencies
1919

2020
## Compatibility
21-
| Back end | Scala versions |
22-
|:-----------|:---------------|
23-
| JVM | 2.11, 2.12 |
24-
| JavaScript | 2.11, 2.12 |
21+
| Back end | Scala versions |
22+
|:-----------|:-----------------|
23+
| JVM | 2.11, 2.12, 2.13 |
24+
| JavaScript | 2.11, 2.12, 2.13 |
25+
| Native | 2.11 |
2526

2627
## Dependencies
2728
```scala

build.toml

Lines changed: 0 additions & 37 deletions
This file was deleted.

build.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build213.toml

build211.toml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[project]
2+
scalaVersion = "2.11.12"
3+
scalaJsVersion = "0.6.28"
4+
scalaNativeVersion = "0.3.9"
5+
scalaOptions = [
6+
"-encoding", "UTF-8",
7+
"-unchecked",
8+
"-deprecation",
9+
"-Xfuture",
10+
"-Ywarn-numeric-widen",
11+
"-feature"
12+
]
13+
testFrameworks = [
14+
"org.scalatest.tools.Framework"
15+
]
16+
17+
[module.translit]
18+
root = "shared"
19+
sources = ["shared/src/main/scala"]
20+
targets = ["js", "jvm", "native"]
21+
22+
[module.translit.jvm]
23+
root = "jvm"
24+
25+
[module.translit.test]
26+
sources = ["shared/src/test/scala"]
27+
targets = ["js", "jvm", "native"]
28+
29+
[module.translit.test.jvm]
30+
sources = ["jvm/src/test/scala"]
31+
scalaDeps = [
32+
["org.scalatest", "scalatest", "3.0.8"],
33+
["com.github.pathikrit", "better-files", "3.8.0"],
34+
["org.scalaj", "scalaj-http", "2.4.2"]
35+
]
36+
37+
[module.translit.test.js]
38+
scalaDeps = [
39+
["org.scalatest", "scalatest", "3.0.8"]
40+
]
41+
42+
[module.translit.test.native]
43+
scalaDeps = [
44+
["org.scalatest", "scalatest", "3.2.0-SNAP10"]
45+
]

build212.toml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[project]
2+
scalaVersion = "2.12.8"
3+
scalaJsVersion = "0.6.28"
4+
scalaOptions = [
5+
"-encoding", "UTF-8",
6+
"-unchecked",
7+
"-deprecation",
8+
"-Xfuture",
9+
"-Ywarn-numeric-widen",
10+
"-feature"
11+
]
12+
testFrameworks = [
13+
"org.scalatest.tools.Framework"
14+
]
15+
16+
[module.translit]
17+
root = "shared"
18+
sources = ["shared/src/main/scala"]
19+
targets = ["js", "jvm"]
20+
21+
[module.translit.jvm]
22+
root = "jvm"
23+
24+
[module.translit.test]
25+
sources = ["shared/src/test/scala"]
26+
targets = ["js", "jvm"]
27+
scalaDeps = [
28+
["org.scalatest", "scalatest", "3.0.8"]
29+
]
30+
31+
[module.translit.test.jvm]
32+
sources = ["jvm/src/test/scala"]
33+
scalaDeps = [
34+
["com.github.pathikrit", "better-files", "3.8.0"],
35+
["org.scalaj", "scalaj-http", "2.4.2"]
36+
]

build213.toml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[project]
2+
scalaVersion = "2.13.0"
3+
scalaJsVersion = "0.6.28"
4+
scalaOptions = [
5+
"-encoding", "UTF-8",
6+
"-unchecked",
7+
"-deprecation",
8+
"-Xfuture",
9+
"-Ywarn-numeric-widen",
10+
"-feature"
11+
]
12+
testFrameworks = [
13+
"org.scalatest.tools.Framework"
14+
]
15+
16+
[module.translit]
17+
root = "shared"
18+
sources = ["shared/src/main/scala"]
19+
targets = ["js", "jvm"]
20+
21+
[module.translit.jvm]
22+
root = "jvm"
23+
24+
[module.translit.test]
25+
sources = ["shared/src/test/scala"]
26+
targets = ["js", "jvm"]
27+
scalaDeps = [
28+
["org.scalatest", "scalatest", "3.0.8"]
29+
]
30+
31+
[module.translit.test.jvm]
32+
sources = ["jvm/src/test/scala"]
33+
scalaDeps = [
34+
["com.github.pathikrit", "better-files", "3.8.0"],
35+
["org.scalaj", "scalaj-http", "2.4.2"]
36+
]

0 commit comments

Comments
 (0)