build: refresh the build system

01-java-helloworld/build.gradle.kts

@@ -1,7 +1,7 @@
 dependencies {
-    implementation(Libs.jgrapht_core)
+    implementation(libs.jgrapht.core)
 }
 
 application {
-    mainClassName = "demo.HelloProtelis"
+    mainClass.set("org.protelis.demo.HelloProtelis")
 }

01-java-helloworld/src/main/java/demo/ConsoleSpeaker.java → 01-java-helloworld/src/main/java/org/protelis/demo/ConsoleSpeaker.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 /**
  * Speaker implementation which uses the standard output.

01-java-helloworld/src/main/java/demo/Device.java → 01-java-helloworld/src/main/java/org/protelis/demo/Device.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.hash.Hashing;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -25,7 +25,8 @@ public class Device {
      */
     public Device(final ProtelisProgram program, final int uid, final NetworkManager networkManager, final Speaker speaker) {
         this.networkManager = networkManager;
-        this.deviceCapabilities = new DeviceCapabilities(uid, networkManager, new HashingCodePathFactory(Hashing.sha256()), speaker);
+        this.deviceCapabilities =
+            new DeviceCapabilities(uid, networkManager, new HashingCodePathFactory(Hashing.sha256()), speaker);
         this.vm = new ProtelisVM(program, deviceCapabilities);
     }
 

01-java-helloworld/src/main/java/demo/DeviceCapabilities.java → 01-java-helloworld/src/main/java/org/protelis/demo/DeviceCapabilities.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import org.protelis.lang.datatype.DeviceUID;
 import org.protelis.vm.CodePathFactory;

01-java-helloworld/src/main/java/demo/EmulatedNetworkManager.java → 01-java-helloworld/src/main/java/org/protelis/demo/EmulatedNetworkManager.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.collect.ImmutableSet;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

01-java-helloworld/src/main/java/demo/HelloProtelis.java → 01-java-helloworld/src/main/java/org/protelis/demo/HelloProtelis.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import org.jgrapht.Graph;
 import org.jgrapht.Graphs;

01-java-helloworld/src/main/java/demo/IntDeviceUID.java → 01-java-helloworld/src/main/java/org/protelis/demo/IntDeviceUID.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import org.protelis.lang.datatype.DeviceUID;
 

01-java-helloworld/src/main/java/demo/Speaker.java → 01-java-helloworld/src/main/java/org/protelis/demo/Speaker.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 /**
  * Protelis component which allows a node to communicate.

01-java-helloworld/src/test/java/demo/JavaHelloTest.java → 01-java-helloworld/src/test/java/org/protelis/demo/JavaHelloTest.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.jgrapht.Graph;

02-kotlin-helloworld/build.gradle.kts

@@ -1,5 +1,6 @@
 dependencies {
-    implementation(Libs.jgrapht_core)
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(libs.jgrapht.core)
 }
 
 application {

02-kotlin-helloworld/src/main/kotlin/ConsoleSpeaker.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/ConsoleSpeaker.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 class ConsoleSpeaker : Speaker {
     override fun announce(something: String) = println(something)

02-kotlin-helloworld/src/main/kotlin/Device.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/Device.kt

@@ -1,6 +1,7 @@
-package demo
+package org.protelis.demo
 
 import com.google.common.hash.Hashing
+import org.protelis.demo.org.protelis.demo.DeviceCapabilities
 import org.protelis.vm.NetworkManager
 import org.protelis.vm.ProtelisProgram
 import org.protelis.vm.ProtelisVM

02-kotlin-helloworld/src/main/kotlin/DeviceCapabilities.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/DeviceCapabilities.kt

@@ -1,5 +1,7 @@
-package demo
+package org.protelis.demo.org.protelis.demo
 
+import org.protelis.demo.IntDeviceUID
+import org.protelis.demo.Speaker
 import org.protelis.vm.CodePathFactory
 import org.protelis.vm.NetworkManager
 import org.protelis.vm.impl.AbstractExecutionContext

02-kotlin-helloworld/src/main/kotlin/EmulatedNetworkManager.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/EmulatedNetworkManager.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import org.protelis.lang.datatype.DeviceUID
 import org.protelis.vm.CodePath

02-kotlin-helloworld/src/main/kotlin/HelloProtelis.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/HelloProtelis.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import org.jgrapht.Graphs
 import org.jgrapht.graph.DefaultEdge

02-kotlin-helloworld/src/main/kotlin/IntDeviceUID.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/IntDeviceUID.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import org.protelis.lang.datatype.DeviceUID
 

02-kotlin-helloworld/src/main/kotlin/Speaker.kt → 02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/Speaker.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 interface Speaker {
     fun announce(something: String)

03-java-socket/build.gradle.kts

@@ -1,10 +1,6 @@
-plugins {
-    kotlin("jvm")
-}
 dependencies {
     implementation(project(":01-java-helloworld"))
-    implementation(kotlin("stdlib-jdk8"))
-    implementation(Libs.konf)
+    implementation(libs.konf)
 }
 
 application {

03-java-socket/src/main/java/demo/HelloProtelis.java → 03-java-socket/src/main/java/org/protelis/demo/HelloProtelis.java

@@ -1,11 +1,11 @@
-package demo;
+package org.protelis.demo;
 
 import com.uchuhimo.konf.BaseConfig;
 import com.uchuhimo.konf.Config;
 import com.uchuhimo.konf.source.DefaultLoaders;
 import com.uchuhimo.konf.source.DefaultTomlLoaderKt;
 import com.uchuhimo.konf.source.Loader;
-import demo.data.ProtelisNode;
+import org.protelis.demo.data.ProtelisNode;
 import org.protelis.lang.ProtelisLoader;
 import org.protelis.vm.ProtelisProgram;
 
@@ -36,7 +36,11 @@ public static void main(final String[] args) throws IOException {
         final List<ProtelisNode> nodes = config.get(ProtelisConfigSpec.nodes);
         final List<Device> devices = new ArrayList<>();
         for (final ProtelisNode n: nodes) {
-            final SocketNetworkManager netmgr = new SocketNetworkManager(new IntDeviceUID(n.getId()), n.getHostandport().getPort(), n.getNeighbors());
+            final SocketNetworkManager netmgr = new SocketNetworkManager(
+                new IntDeviceUID(n.getId()),
+                n.getHostandport().getPort(),
+                n.getNeighbors()
+            );
             netmgr.listen();
             final ProtelisProgram program = ProtelisLoader.parse(protelisModuleName);
             final Device node = new Device(program, n.getId(), netmgr, new ConsoleSpeaker());

03-java-socket/src/main/java/demo/ProtelisConfigSpec.java → 03-java-socket/src/main/java/org/protelis/demo/ProtelisConfigSpec.java

@@ -1,8 +1,8 @@
-package demo;
+package org.protelis.demo;
 
 import com.uchuhimo.konf.ConfigSpec;
 import com.uchuhimo.konf.RequiredItem;
-import demo.data.ProtelisNode;
+import org.protelis.demo.data.ProtelisNode;
 
 import java.util.List;
 

03-java-socket/src/main/java/demo/SocketNetworkManager.java → 03-java-socket/src/main/java/org/protelis/demo/SocketNetworkManager.java

@@ -1,7 +1,7 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.collect.ImmutableSet;
-import demo.data.IPv4Host;
+import org.protelis.demo.data.IPv4Host;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.protelis.lang.datatype.DeviceUID;
 import org.protelis.vm.CodePath;

03-java-socket/src/main/java/demo/data/IPv4Host.java → 03-java-socket/src/main/java/org/protelis/demo/data/IPv4Host.java

@@ -1,4 +1,4 @@
-package demo.data;
+package org.protelis.demo.data;
 
 import java.beans.ConstructorProperties;
 

03-java-socket/src/main/java/demo/data/ProtelisNode.java → 03-java-socket/src/main/java/org/protelis/demo/data/ProtelisNode.java

@@ -1,4 +1,4 @@
-package demo.data;
+package org.protelis.demo.data;
 
 import com.google.common.collect.ImmutableSet;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

03-java-socket/src/test/java/demo/JavaSocketTest.java → 03-java-socket/src/test/java/org/protelis/demo/JavaSocketTest.java

@@ -1,10 +1,10 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.uchuhimo.konf.BaseConfig;
 import com.uchuhimo.konf.Config;
 import com.uchuhimo.konf.source.DefaultTomlLoaderKt;
-import demo.data.ProtelisNode;
+import org.protelis.demo.data.ProtelisNode;
 import org.apache.commons.math3.util.Pair;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;

04-kotlin-socket/build.gradle.kts

@@ -1,6 +1,7 @@
 dependencies {
     implementation(project(":02-kotlin-helloworld"))
-    implementation(Libs.konf)
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(libs.konf)
 }
 
 application {

04-kotlin-socket/src/main/kotlin/HelloProtelis.kt → 04-kotlin-socket/src/main/kotlin/org/protelis/demo/HelloProtelis.kt

@@ -1,7 +1,8 @@
-package demo
+package org.protelis.demo
 
 import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.source.toml
+import demo.org.protelis.demo.ProtelisConfigSpec
 import org.protelis.lang.ProtelisLoader
 
 class Main {

04-kotlin-socket/src/main/kotlin/ProtelisConfigSpec.kt → 04-kotlin-socket/src/main/kotlin/org/protelis/demo/ProtelisConfigSpec.kt

@@ -1,4 +1,4 @@
-package demo
+package demo.org.protelis.demo
 
 import com.uchuhimo.konf.ConfigSpec
 

04-kotlin-socket/src/main/kotlin/SocketNetworkManager.kt → 04-kotlin-socket/src/main/kotlin/org/protelis/demo/SocketNetworkManager.kt

@@ -1,5 +1,6 @@
-package demo
+package org.protelis.demo
 
+import demo.org.protelis.demo.IPv4Host
 import org.protelis.lang.datatype.DeviceUID
 import org.protelis.vm.CodePath
 import org.protelis.vm.NetworkManager

04-kotlin-socket/src/test/kotlin/KotlinSocketTest.kt

@@ -1,14 +1,11 @@
+package org.protelis.demo
+
 import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.source.toml
-import demo.ConsoleSpeaker
-import demo.Device
-import demo.IntDeviceUID
-import demo.ProtelisConfigSpec
-import demo.SocketNetworkManager
-import demo.Speaker
-import io.kotlintest.Spec
-import io.kotlintest.matchers.numerics.shouldBeGreaterThan
-import io.kotlintest.specs.StringSpec
+import demo.org.protelis.demo.ProtelisConfigSpec
+import io.kotest.core.spec.Spec
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.ints.shouldBeGreaterThan
 import io.mockk.spyk
 import io.mockk.verify
 import org.protelis.lang.ProtelisLoader
@@ -26,7 +23,7 @@ class KotlinSocketTest : StringSpec() {
         .filter { it.leader }
         .map { it.id }
 
-    override fun beforeSpec(spec: Spec) {
+    override suspend fun beforeSpec(spec: Spec) {
         nodes.forEach {
             val socketNetworkManager = SocketNetworkManager(IntDeviceUID(it.id), it.hostandport.port, it.neighbors).apply { listen() }
             val program = ProtelisLoader.parse(protelisModuleName)

05-java-mqtt/build.gradle.kts

@@ -1,13 +1,8 @@
-plugins {
-    kotlin("jvm")
-}
-
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-    implementation(Libs.org_eclipse_paho_client_mqttv3)
-    implementation(Libs.moquette_broker)
     implementation(project(":01-java-helloworld"))
-    implementation(Libs.konf)
+    implementation(libs.konf)
+    implementation(libs.paho)
+    implementation(libs.moquette.broker)
 }
 
 application {

05-java-mqtt/src/main/java/demo/HelloProtelis.java → 05-java-mqtt/src/main/java/org/protelis/demo/HelloProtelis.java

@@ -1,16 +1,19 @@
-package demo;
+package org.protelis.demo;
 
 import com.uchuhimo.konf.BaseConfig;
 import com.uchuhimo.konf.Config;
 import com.uchuhimo.konf.source.DefaultTomlLoaderKt;
-import demo.data.MqttProtelisNode;
+import org.protelis.demo.data.MqttProtelisNode;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.protelis.lang.ProtelisLoader;
 import org.protelis.vm.ProtelisProgram;
 
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Entrypoint for the MQTT demo.
+ */
 public final class HelloProtelis {
 
     private HelloProtelis() { }

05-java-mqtt/src/main/java/demo/MqttNetworkManager.java → 05-java-mqtt/src/main/java/org/protelis/demo/MqttNetworkManager.java

@@ -1,4 +1,4 @@
-package demo;
+package org.protelis.demo;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;

05-java-mqtt/src/main/java/demo/ProtelisConfigSpec.java → 05-java-mqtt/src/main/java/org/protelis/demo/ProtelisConfigSpec.java

@@ -1,8 +1,8 @@
-package demo;
+package org.protelis.demo;
 
 import com.uchuhimo.konf.ConfigSpec;
 import com.uchuhimo.konf.RequiredItem;
-import demo.data.MqttProtelisNode;
+import org.protelis.demo.data.MqttProtelisNode;
 
 import java.util.List;
 

05-java-mqtt/src/main/java/demo/data/MqttProtelisNode.java → 05-java-mqtt/src/main/java/org/protelis/demo/data/MqttProtelisNode.java

@@ -1,4 +1,4 @@
-package demo.data;
+package org.protelis.demo.data;
 
 import com.google.common.collect.ImmutableList;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

05-java-mqtt/src/test/java/demo/JavaMqttTest.java → 05-java-mqtt/src/test/java/org/protelis/demo/JavaMqttTest.java

@@ -1,10 +1,10 @@
-package demo;
+package org.protelis.demo;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.uchuhimo.konf.BaseConfig;
 import com.uchuhimo.konf.Config;
 import com.uchuhimo.konf.source.DefaultTomlLoaderKt;
-import demo.data.MqttProtelisNode;
+import org.protelis.demo.data.MqttProtelisNode;
 import io.moquette.broker.Server;
 import org.apache.commons.math3.util.Pair;
 import org.eclipse.paho.client.mqttv3.MqttException;

06-kotlin-mqtt/build.gradle.kts

@@ -1,12 +1,9 @@
-repositories {
-    jcenter()
-}
-
 dependencies {
     implementation(project(":02-kotlin-helloworld"))
-    implementation(Libs.konf)
-    implementation(Libs.org_eclipse_paho_client_mqttv3)
-    implementation(Libs.moquette_broker)
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(libs.konf)
+    implementation(libs.paho)
+    implementation(libs.moquette.broker)
 }
 
 application {

06-kotlin-mqtt/src/main/kotlin/MqttNetworkManager.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import org.eclipse.paho.client.mqttv3.IMqttToken
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient

06-kotlin-mqtt/src/main/kotlin/HelloProtelis.kt → 06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/HelloProtelis.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.source.toml

06-kotlin-mqtt/src/main/kotlin/ProtelisConfigSpec.kt → 06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/ProtelisConfigSpec.kt

@@ -1,4 +1,4 @@
-package demo
+package org.protelis.demo
 
 import com.uchuhimo.konf.ConfigSpec