Skip to content

Commit 08d35f6

Browse files
committed
Move from io.github.deltacv to org.deltacv & use Jackson for TOML
1 parent c6b140b commit 08d35f6

172 files changed

Lines changed: 847 additions & 599 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Common/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ wpilibTools.deps.wpilibVersion = wpilibVersion
1818

1919
dependencies {
2020
// WPILib OpenCV replaces openpnp
21-
api wpilibTools.deps.wpilibOpenCvJava(opencvVersion)
21+
compileOnly wpilibTools.deps.wpilibOpenCvJava(opencvVersion)
2222

23-
implementation "com.moandjiezana.toml:toml4j:$toml4j_version"
23+
// Replace toml4j with Jackson TOML dataformat
24+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-toml:$jackson_version"
2425
implementation "info.picocli:picocli:$picocli_version"
2526
implementation "org.slf4j:slf4j-api:$slf4j_version"
2627

Common/src/main/java/com/github/serivesmejia/eocvsim/pipeline/instantiator/DefaultPipelineInstantiator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.github.serivesmejia.eocvsim.pipeline.instantiator
77

8-
import io.github.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
8+
import org.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
99
import org.firstinspires.ftc.robotcore.external.Telemetry
1010
import org.openftc.easyopencv.OpenCvPipeline
1111

Common/src/main/java/com/github/serivesmejia/eocvsim/pipeline/instantiator/PipelineInstantiator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.github.serivesmejia.eocvsim.pipeline.instantiator
77

8-
import io.github.deltacv.eocvsim.virtualreflect.VirtualReflection
8+
import org.deltacv.eocvsim.virtualreflect.VirtualReflection
99
import org.firstinspires.ftc.robotcore.external.Telemetry
1010
import org.openftc.easyopencv.OpenCvPipeline
1111

Common/src/main/java/com/github/serivesmejia/eocvsim/util/event/EventHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.github.serivesmejia.eocvsim.util.event
77

8-
import io.github.deltacv.common.util.loggerOf
8+
import org.deltacv.common.util.loggerOf
99
import kotlinx.coroutines.CoroutineScope
1010
import kotlinx.coroutines.launch
1111
import kotlinx.coroutines.runBlocking

Common/src/main/java/com/github/serivesmejia/eocvsim/util/io/EOCVSimFolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package com.github.serivesmejia.eocvsim.util.io
77

88
import com.github.serivesmejia.eocvsim.util.extension.appData
9-
import io.github.deltacv.common.util.loggerForThis
9+
import org.deltacv.common.util.loggerForThis
1010
import java.io.File
1111

1212
/**

Common/src/main/java/com/github/serivesmejia/eocvsim/util/io/Lock.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.github.serivesmejia.eocvsim.util.io
77

8-
import io.github.deltacv.common.util.loggerForThis
8+
import org.deltacv.common.util.loggerForThis
99
import java.io.File
1010
import java.io.RandomAccessFile
1111
import java.nio.channels.FileLock

Common/src/main/java/com/github/serivesmejia/eocvsim/util/orchestration/Orchestrator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package com.github.serivesmejia.eocvsim.util.orchestration
99

10-
import io.github.deltacv.common.util.loggerOf
10+
import org.deltacv.common.util.loggerOf
1111
import kotlinx.coroutines.*
1212
import kotlin.reflect.KClass
1313

Common/src/main/java/io/github/deltacv/eocvsim/plugin/api/exception/EOCVSimApiException.kt

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

Common/src/main/java/io/github/deltacv/common/image/BufferedImageRecycler.java renamed to Common/src/main/java/org/deltacv/common/image/BufferedImageRecycler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License.
44
*/
55

6-
package io.github.deltacv.common.image;
6+
package org.deltacv.common.image;
77

88
import java.awt.*;
99
import java.awt.image.BufferedImage;

Common/src/main/java/io/github/deltacv/common/image/DynamicBufferedImageRecycler.java renamed to Common/src/main/java/org/deltacv/common/image/DynamicBufferedImageRecycler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License.
44
*/
55

6-
package io.github.deltacv.common.image;
6+
package org.deltacv.common.image;
77

88
import java.awt.*;
99
import java.awt.image.BufferedImage;

0 commit comments

Comments
 (0)