Merge pull request #31 from code-star/shared

Added shared library between backend and data project

Author: Hayena

Diff for: .github/workflows/build-and-test.yml

@@ -3,8 +3,17 @@ name: build-and-test
 on: [push]
 
 jobs:
+  shared:
+    name: "shared / Build and test"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run Gradle
+      run: ./gradlew :shared:clean :shared:test
+
   backend:
     name: "backend / Build and test"
+    needs: shared
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -25,9 +34,12 @@ jobs:
 
   data:
     name: "data / Build and test"
+    needs: shared
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - name: Run Gradle
       run: ./gradlew :data:clean :data:test
 
+
+

Diff for: backend/build.gradle.kts

@@ -27,13 +27,6 @@ application {
     mainClassName = "io.ktor.server.netty.EngineMain"
 }
 
-repositories {
-    mavenLocal()
-    jcenter()
-    maven { url = uri("https://kotlin.bintray.com/ktor") }
-    maven { url = uri("https://plugins.gradle.org/m2/") }
-}
-
 tasks {
     withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"

Diff for: data/build.gradle.kts

@@ -32,14 +32,8 @@ apply {
     plugin("com.github.johnrengelman.shadow")
 }
 
-repositories {
-    mavenLocal()
-    jcenter()
-    maven { url = uri("https://kotlin.bintray.com/ktor") }
-    maven { url = uri("https://plugins.gradle.org/m2/") }
-}
-
 dependencies {
+    implementation(project(":shared"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")

Diff for: data/src/main/kotlin/nl/codestar/interchange/Application.kt

@@ -18,8 +18,6 @@ import nl.codestar.interchange.domain.Position
 
 import nl.codestar.interchange.here.HereRoutingAPIResponse
 
-
-
 fun CoroutineScope.produceNumbers() = produce<List<HereRoute>> {
     while (true) {
 

Diff for: settings.gradle.kts

@@ -2,3 +2,4 @@ rootProject.name = "interchange"
 
 include("backend")
 include("data")
+include("shared")

Diff for: shared/build.gradle.kts

@@ -0,0 +1,33 @@
+val serialization_version: String by project
+
+plugins {
+    kotlin("jvm")
+}
+
+group = "nl.codestar"
+version = "0.0.1-SNAPSHOT"
+
+buildscript {
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.50")
+    }
+}
+
+apply {
+    plugin("kotlinx-serialization")
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version")
+    testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2")
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+}

Diff for: shared/build/classes/kotlin/main/META-INF/shared.kotlin_module

@@ -0,0 +1,2 @@
+1
+0

Diff for: shared/build/classes/kotlin/test/META-INF/shared.kotlin_module

@@ -0,0 +1,2 @@
+1
+0

Diff for: shared/build/kotlin/compileKotlin/build-history.bin

@@ -0,0 +1 @@
+/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Edge$$serializer.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Edge$Companion.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Edge.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Graph$Companion$descriptor$1.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Graph$Companion.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Graph.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Node$$serializer.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Node$Companion.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Node.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Position$$serializer.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Position$Companion.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/Position.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/RefEdge$$serializer.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/RefEdge$Companion.class:/Users/dku21348/Projects/codestar/interchange/shared/build/classes/kotlin/main/nl/codestar/interchange/RefEdge.class

Diff for: shared/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Test results - Class nl.codestar.interchange.domain.GraphTest</title>
+<link href="../css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="../css/style.css" rel="stylesheet" type="text/css"/>
+<script src="../js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Class nl.codestar.interchange.domain.GraphTest</h1>
+<div class="breadcrumbs">
+<a href="../index.html">all</a> &gt; 
+<a href="../packages/nl.codestar.interchange.domain.html">nl.codestar.interchange.domain</a> &gt; GraphTest</div>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">1</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="ignored">
+<div class="counter">0</div>
+<p>ignored</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">0.035s</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">100%</div>
+<p>successful</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Tests</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Tests</h2>
+<table>
+<thead>
+<tr>
+<th>Test</th>
+<th>Duration</th>
+<th>Result</th>
+</tr>
+</thead>
+<tr>
+<td class="success">serialization should work correctly</td>
+<td class="success">0.035s</td>
+<td class="success">passed</td>
+</tr>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 6.1</a> at 17-Jan-2020 15:09:51</p>
+</div>
+</div>
+</body>
+</html>

Diff for: shared/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream

@@ -0,0 +1,179 @@
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: sans-serif;
+    font-size: 12pt;
+}
+
+body, a, a:visited {
+    color: #303030;
+}
+
+#content {
+    padding-left: 50px;
+    padding-right: 50px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+#content h1 {
+    font-size: 160%;
+    margin-bottom: 10px;
+}
+
+#footer {
+    margin-top: 100px;
+    font-size: 80%;
+    white-space: nowrap;
+}
+
+#footer, #footer a {
+    color: #a0a0a0;
+}
+
+#line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+#label-for-line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+ul {
+    margin-left: 0;
+}
+
+h1, h2, h3 {
+    white-space: nowrap;
+}
+
+h2 {
+    font-size: 120%;
+}
+
+ul.tabLinks {
+    padding-left: 0;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    overflow: auto;
+    min-width: 800px;
+    width: auto !important;
+    width: 800px;
+}
+
+ul.tabLinks li {
+    float: left;
+    height: 100%;
+    list-style: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-bottom: 0;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+    margin-right: 25px;
+    border: solid 1px #d4d4d4;
+    background-color: #f0f0f0;
+}
+
+ul.tabLinks li:hover {
+    background-color: #fafafa;
+}
+
+ul.tabLinks li.selected {
+    background-color: #c5f0f5;
+    border-color: #c5f0f5;
+}
+
+ul.tabLinks a {
+    font-size: 120%;
+    display: block;
+    outline: none;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+}
+
+ul.tabLinks li h2 {
+    margin: 0;
+    padding: 0;
+}
+
+div.tab {
+}
+
+div.selected {
+    display: block;
+}
+
+div.deselected {
+    display: none;
+}
+
+div.tab table {
+    min-width: 350px;
+    width: auto !important;
+    width: 350px;
+    border-collapse: collapse;
+}
+
+div.tab th, div.tab table {
+    border-bottom: solid #d0d0d0 1px;
+}
+
+div.tab th {
+    text-align: left;
+    white-space: nowrap;
+    padding-left: 6em;
+}
+
+div.tab th:first-child {
+    padding-left: 0;
+}
+
+div.tab td {
+    white-space: nowrap;
+    padding-left: 6em;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+div.tab td:first-child {
+    padding-left: 0;
+}
+
+div.tab td.numeric, div.tab th.numeric {
+    text-align: right;
+}
+
+span.code {
+    display: inline-block;
+    margin-top: 0em;
+    margin-bottom: 1em;
+}
+
+span.code pre {
+    font-size: 11pt;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0;
+    background-color: #f7f7f7;
+    border: solid 1px #d0d0d0;
+    min-width: 700px;
+    width: auto !important;
+    width: 700px;
+}
+
+span.wrapped pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: break-all;
+}
+
+label.hidden {
+    display: none;
+}