diff --git a/.classpath b/.classpath
index b6d8b74..86dccd0 100644
--- a/.classpath
+++ b/.classpath
@@ -11,11 +11,6 @@
-
-
-
-
-
@@ -27,5 +22,10 @@
+
+
+
+
+
diff --git a/.project b/.project
index 07cff41..831c5ff 100644
--- a/.project
+++ b/.project
@@ -23,12 +23,12 @@
- 1646149232198
+ 1664626602847
30
org.eclipse.core.resources.regexFilterMatcher
- node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
+ 1.0-name-matches-false-true-node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__
diff --git a/build.gradle___ b/build.gradle___
deleted file mode 100644
index 8ade4d4..0000000
--- a/build.gradle___
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java library project to get you started.
- * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
- * User Manual available at https://docs.gradle.org/6.8.3/userguide/building_java_projects.html
- */
-import com.github.jk1.license.render.*
-
-plugins {
- id 'java-library'
- id 'com.adarshr.test-logger' version '3.0.0'
- id "com.github.spotbugs" version "4.7.0"
-}
-
-sourceCompatibility = 15
-
-tasks.withType(JavaCompile) {
- options.compilerArgs += '--enable-preview'
-}
-tasks.withType(Test) {
- jvmArgs += "--enable-preview"
-}
-
-sourceSets {
- main {
- buildDir 'out/gradle'
- java {
- srcDir 'src'
- }
- resources {
- srcDir 'resources'
- }
- version = rootProject.file('etk/version.txt').text.trim()
- }
- test {
- java {
- srcDir 'test/src'
- }
- resources {
- srcDir 'test/resources'
- }
- }
-}
-
-repositories {
- // Use JCenter for resolving dependencies.
- jcenter()
- google()
-}
-
-dependencies {
- // Use JUnit Jupiter API for testing.
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
-
- // Use JUnit Jupiter Engine for testing.
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-
- implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1'
-
- compile project(':scenarium-logger')
-}
-
-
-tasks.named('test') {
- // Use junit platform for unit tests.
- useJUnitPlatform()
-}
-
-
-tasks.named('jar') {
- manifest {
- attributes('Implementation-Title': project.name,
- 'Implementation-Version': project.version)
- }
-}
-
-
-task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = 'sources'
- from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
-}
-
-testlogger {
- showFullStackTraces true
- showSimpleNames true
- // pick a theme - mocha, standard, plain, mocha-parallel, standard-parallel or plain-parallel
- theme 'mocha'
-}
-
-artifacts {
- archives sourcesJar
- archives javadocJar
-}
-
-jar {
- manifest {
- attributes 'Implementation-Title': 'Ewol tool Kit (ETK)', 'Implementation-Version': version
- }
-}
\ No newline at end of file
diff --git a/etk.iml b/etk.iml
deleted file mode 100644
index a56a2fc..0000000
--- a/etk.iml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/settings.gradle__ b/settings.gradle__
deleted file mode 100644
index d9e4288..0000000
--- a/settings.gradle__
+++ /dev/null
@@ -1,2 +0,0 @@
-
-rootProject.name = 'etk'
diff --git a/src/module-info.java b/src/module-info.java
index 1330bdd..64d366a 100644
--- a/src/module-info.java
+++ b/src/module-info.java
@@ -7,6 +7,6 @@ open module org.atriasoft.etk {
exports org.atriasoft.etk.math;
exports org.atriasoft.etk.util;
- requires transitive io.scenarium.logger;
+ requires transitive org.atriasoft.reggol;
requires com.github.spotbugs.annotations;
}
diff --git a/src/org/atriasoft/etk/internal/Log.java b/src/org/atriasoft/etk/internal/Log.java
index 4b7c097..521b490 100644
--- a/src/org/atriasoft/etk/internal/Log.java
+++ b/src/org/atriasoft/etk/internal/Log.java
@@ -1,7 +1,7 @@
package org.atriasoft.etk.internal;
-import io.scenarium.logger.LogLevel;
-import io.scenarium.logger.Logger;
+import org.atriasoft.reggol.LogLevel;
+import org.atriasoft.reggol.Logger;
public class Log {
private static final boolean FORCE_ALL = false;
diff --git a/test/src/test/atriasoft/etk/Log.java b/test/src/test/atriasoft/etk/Log.java
index 5c3b329..0617ac2 100644
--- a/test/src/test/atriasoft/etk/Log.java
+++ b/test/src/test/atriasoft/etk/Log.java
@@ -1,7 +1,7 @@
package test.atriasoft.etk;
-import io.scenarium.logger.LogLevel;
-import io.scenarium.logger.Logger;
+import org.atriasoft.reggol.LogLevel;
+import org.atriasoft.reggol.Logger;
public class Log {
private static final String LIB_NAME = "etk-test";
diff --git a/test/src/test/atriasoft/etk/Log2.java b/test/src/test/atriasoft/etk/Log2.java
index 6b57782..6079ea2 100644
--- a/test/src/test/atriasoft/etk/Log2.java
+++ b/test/src/test/atriasoft/etk/Log2.java
@@ -1,7 +1,7 @@
package test.atriasoft.etk;
-import io.scenarium.logger.LogLevel;
-import io.scenarium.logger.Logger;
+import org.atriasoft.reggol.LogLevel;
+import org.atriasoft.reggol.Logger;
public class Log2 {
private static final String LIB_NAME = "etk-test-2";
diff --git a/test/src/test/atriasoft/etk/TestBasicLog.java b/test/src/test/atriasoft/etk/TestBasicLog.java
index 22f6b89..d7e4c8c 100644
--- a/test/src/test/atriasoft/etk/TestBasicLog.java
+++ b/test/src/test/atriasoft/etk/TestBasicLog.java
@@ -11,7 +11,7 @@ package test.atriasoft.etk;
import java.util.ArrayList;
import java.util.List;
-import io.scenarium.logger.Logger;
+import org.atriasoft.reggol.Logger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;