diff --git a/gradle.properties b/gradle.properties index 8336e5c..8effd8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ systemProp.gradle.user.home=/Users/kinch/.gradle/ org.gradle.parallel=true org.gradle.caching=true -version=1.0 \ No newline at end of file +version=1.0 +group=de.itkl \ No newline at end of file diff --git a/libraries/clients/build.gradle.kts b/libraries/clients/build.gradle.kts new file mode 100644 index 0000000..e69de29 diff --git a/libraries/clients/src/main/kotlin/de/itkl/clients/MsOcr.kt b/libraries/clients/src/main/kotlin/de/itkl/clients/MsOcr.kt new file mode 100644 index 0000000..f2a5ac7 --- /dev/null +++ b/libraries/clients/src/main/kotlin/de/itkl/clients/MsOcr.kt @@ -0,0 +1,6 @@ +package de.itkl.clients + +class MsOcr { + + suspend fun ocr() {} +} \ No newline at end of file diff --git a/libraries/core-api/build.gradle.kts b/libraries/core-api/build.gradle.kts new file mode 100644 index 0000000..7bf4c6c --- /dev/null +++ b/libraries/core-api/build.gradle.kts @@ -0,0 +1,4 @@ +dependencies { + // used for contentType + api("io.ktor:ktor-http-jvm:2.3.7") +} \ No newline at end of file diff --git a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/FileProcessor.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/FileProcessor.kt similarity index 83% rename from libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/FileProcessor.kt rename to libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/FileProcessor.kt index 3f156a0..c5f907d 100644 --- a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/FileProcessor.kt +++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/FileProcessor.kt @@ -1,4 +1,4 @@ -package de.itkl.fileprocessing +package de.itkl.core_api.interfaces import java.io.File import java.io.InputStream diff --git a/libraries/io/src/main/kotlin/de/itkl/io/interfaces/Resource.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/Resource.kt similarity index 84% rename from libraries/io/src/main/kotlin/de/itkl/io/interfaces/Resource.kt rename to libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/Resource.kt index 7aee589..f6c437f 100644 --- a/libraries/io/src/main/kotlin/de/itkl/io/interfaces/Resource.kt +++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/Resource.kt @@ -1,11 +1,9 @@ -package de.itkl.io.interfaces +package de.itkl.core_api.interfaces import io.ktor.http.* import org.koin.core.component.KoinComponent import org.koin.core.component.get -import org.koin.core.qualifier.named import java.io.InputStream -import java.io.InputStreamReader abstract class Resource : KoinComponent { abstract val filename: String diff --git a/libraries/io/src/main/kotlin/de/itkl/io/interfaces/ResourceReadDecorator.kt b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/ResourceReadDecorator.kt similarity index 89% rename from libraries/io/src/main/kotlin/de/itkl/io/interfaces/ResourceReadDecorator.kt rename to libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/ResourceReadDecorator.kt index 87ef9c7..d403a9e 100644 --- a/libraries/io/src/main/kotlin/de/itkl/io/interfaces/ResourceReadDecorator.kt +++ b/libraries/core-api/src/main/kotlin/de/itkl/core_api/interfaces/ResourceReadDecorator.kt @@ -1,4 +1,4 @@ -package de.itkl.io.interfaces +package de.itkl.core_api.interfaces import java.io.InputStream diff --git a/libraries/fileprocessing/build.gradle.kts b/libraries/fileprocessing/build.gradle.kts index da9f7d0..b46b61e 100644 --- a/libraries/fileprocessing/build.gradle.kts +++ b/libraries/fileprocessing/build.gradle.kts @@ -1,3 +1,4 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") + api(project(":libraries:core-api")) } diff --git a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt b/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt index 9643c63..1a088e9 100644 --- a/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt +++ b/libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt @@ -1,7 +1,7 @@ package de.itkl.fileprocessing +import de.itkl.core_api.interfaces.FileProcessor import io.github.oshai.kotlinlogging.KotlinLogging -import org.koin.core.annotation.KoinReflectAPI import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.File diff --git a/libraries/io/build.gradle.kts b/libraries/io/build.gradle.kts index 25c5111..f65fc07 100644 --- a/libraries/io/build.gradle.kts +++ b/libraries/io/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - implementation("io.ktor:ktor-http-jvm:2.3.7") + api(project(":libraries:core-api")) } \ No newline at end of file diff --git a/libraries/io/src/main/kotlin/de/itkl/io/implementation/FileSystemResource.kt b/libraries/io/src/main/kotlin/de/itkl/io/implementation/FileSystemResource.kt index 969e76d..519ea73 100644 --- a/libraries/io/src/main/kotlin/de/itkl/io/implementation/FileSystemResource.kt +++ b/libraries/io/src/main/kotlin/de/itkl/io/implementation/FileSystemResource.kt @@ -1,6 +1,6 @@ package de.itkl.io.implementation -import de.itkl.io.interfaces.Resource +import de.itkl.core_api.interfaces.Resource import io.ktor.http.* import java.io.File import java.io.InputStream diff --git a/libraries/io/src/main/kotlin/de/itkl/io/ioModule.kt b/libraries/io/src/main/kotlin/de/itkl/io/ioModule.kt index 0619bc0..d242b35 100644 --- a/libraries/io/src/main/kotlin/de/itkl/io/ioModule.kt +++ b/libraries/io/src/main/kotlin/de/itkl/io/ioModule.kt @@ -1,7 +1,7 @@ package de.itkl.io -import de.itkl.io.interfaces.NoopResourceReadDecorator -import de.itkl.io.interfaces.ResourceReadDecorator +import de.itkl.core_api.interfaces.NoopResourceReadDecorator +import de.itkl.core_api.interfaces.ResourceReadDecorator import org.koin.dsl.module val ioModule = module {