diff --git a/build.gradle.kts b/build.gradle.kts index 77d655e..19a06f2 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL -import workspace.WorkspaceUtils.purchaseArtifact -import workspace.jbake.JBakeGhPagesPlugin +import school.WorkspaceUtils.purchaseArtifact +import school.jbake.JBakeGhPagesPlugin plugins { idea } -apply() -apply() +apply() +apply() apply() -apply() +apply() purchaseArtifact() diff --git a/buildSrc/src/main/kotlin/workspace/WorkspaceManager.kt b/buildSrc/src/main/kotlin/school/WorkspaceManager.kt similarity index 95% rename from buildSrc/src/main/kotlin/workspace/WorkspaceManager.kt rename to buildSrc/src/main/kotlin/school/WorkspaceManager.kt index 1a08809..daa49c5 100755 --- a/buildSrc/src/main/kotlin/workspace/WorkspaceManager.kt +++ b/buildSrc/src/main/kotlin/school/WorkspaceManager.kt @@ -1,4 +1,4 @@ -package workspace +package school import arrow.core.Either import arrow.core.left @@ -11,15 +11,15 @@ import org.eclipse.jgit.transport.PushResult import org.eclipse.jgit.transport.URIish import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider import org.gradle.api.Project -import workspace.git.WorkspaceError.FileNotFound -import workspace.git.WorkspaceError.ParsingError -import workspace.WorkspaceUtils.createDirectory -import workspace.WorkspaceUtils.sep -import workspace.WorkspaceUtils.yamlMapper -import workspace.git.* -import workspace.jbake.BakeConfiguration -import workspace.jbake.JBakeGhPagesManager.copyFilesTo -import workspace.jbake.SiteConfiguration +import school.WorkspaceUtils.createDirectory +import school.WorkspaceUtils.sep +import school.WorkspaceUtils.yamlMapper +import school.git.* +import school.git.WorkspaceError.FileNotFound +import school.git.WorkspaceError.ParsingError +import school.jbake.BakeConfiguration +import school.jbake.JBakeGhPagesManager.copyFilesTo +import school.jbake.SiteConfiguration import java.io.File import java.io.IOException import java.nio.charset.StandardCharsets.UTF_8 diff --git a/buildSrc/src/main/kotlin/workspace/WorkspaceUtils.kt b/buildSrc/src/main/kotlin/school/WorkspaceUtils.kt similarity index 99% rename from buildSrc/src/main/kotlin/workspace/WorkspaceUtils.kt rename to buildSrc/src/main/kotlin/school/WorkspaceUtils.kt index 9765525..c626ac2 100755 --- a/buildSrc/src/main/kotlin/workspace/WorkspaceUtils.kt +++ b/buildSrc/src/main/kotlin/school/WorkspaceUtils.kt @@ -1,4 +1,4 @@ -package workspace +package school import arrow.integrations.jackson.module.registerArrowModule import com.fasterxml.jackson.databind.ObjectMapper diff --git a/buildSrc/src/main/kotlin/workspace/ai/AssistantManager.kt b/buildSrc/src/main/kotlin/school/ai/AssistantManager.kt similarity index 99% rename from buildSrc/src/main/kotlin/workspace/ai/AssistantManager.kt rename to buildSrc/src/main/kotlin/school/ai/AssistantManager.kt index a558082..48e7da0 100755 --- a/buildSrc/src/main/kotlin/workspace/ai/AssistantManager.kt +++ b/buildSrc/src/main/kotlin/school/ai/AssistantManager.kt @@ -1,4 +1,4 @@ -package workspace.ai +package school.ai import arrow.core.Either import arrow.core.Either.Companion.catch diff --git a/buildSrc/src/main/kotlin/workspace/ai/AssistantPlugin.kt b/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt similarity index 88% rename from buildSrc/src/main/kotlin/workspace/ai/AssistantPlugin.kt rename to buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt index 5cd2f2c..7c72e35 100755 --- a/buildSrc/src/main/kotlin/workspace/ai/AssistantPlugin.kt +++ b/buildSrc/src/main/kotlin/school/ai/AssistantPlugin.kt @@ -1,4 +1,4 @@ -package workspace.ai +package school.ai import arrow.core.Either.Left import arrow.core.Either.Right @@ -6,11 +6,11 @@ import dev.langchain4j.model.openai.OpenAiChatModel import kotlinx.coroutines.runBlocking import org.gradle.api.Plugin import org.gradle.api.Project -import workspace.ai.AssistantManager.apiKey -import workspace.ai.AssistantManager.createOllamaChatModel -import workspace.ai.AssistantManager.createOllamaStreamingChatModel -import workspace.ai.AssistantManager.generateStreamingResponse -import workspace.ai.AssistantManager.userMessage +import school.ai.AssistantManager.apiKey +import school.ai.AssistantManager.createOllamaChatModel +import school.ai.AssistantManager.createOllamaStreamingChatModel +import school.ai.AssistantManager.generateStreamingResponse +import school.ai.AssistantManager.userMessage class AssistantPlugin : Plugin { diff --git a/buildSrc/src/main/kotlin/school/ai/models.kt b/buildSrc/src/main/kotlin/school/ai/models.kt new file mode 100755 index 0000000..b1c895b --- /dev/null +++ b/buildSrc/src/main/kotlin/school/ai/models.kt @@ -0,0 +1,2 @@ +package school.ai + diff --git a/buildSrc/src/main/kotlin/workspace/courses/Courses.kt b/buildSrc/src/main/kotlin/school/courses/Courses.kt similarity index 80% rename from buildSrc/src/main/kotlin/workspace/courses/Courses.kt rename to buildSrc/src/main/kotlin/school/courses/Courses.kt index b708729..c98f4a8 100644 --- a/buildSrc/src/main/kotlin/workspace/courses/Courses.kt +++ b/buildSrc/src/main/kotlin/school/courses/Courses.kt @@ -1,4 +1,4 @@ -package workspace.courses +package school.courses object Courses { const val JSON_FILE = "patron-formation.json" diff --git a/buildSrc/src/main/kotlin/workspace/courses/CoursesManager.kt b/buildSrc/src/main/kotlin/school/courses/CoursesManager.kt similarity index 50% rename from buildSrc/src/main/kotlin/workspace/courses/CoursesManager.kt rename to buildSrc/src/main/kotlin/school/courses/CoursesManager.kt index 84a7db3..857f0f7 100644 --- a/buildSrc/src/main/kotlin/workspace/courses/CoursesManager.kt +++ b/buildSrc/src/main/kotlin/school/courses/CoursesManager.kt @@ -1,4 +1,4 @@ -package workspace.courses +package school.courses object CoursesManager { diff --git a/buildSrc/src/main/kotlin/workspace/courses/CoursesPlugin.kt b/buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt similarity index 96% rename from buildSrc/src/main/kotlin/workspace/courses/CoursesPlugin.kt rename to buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt index bdc8496..6d38d7a 100644 --- a/buildSrc/src/main/kotlin/workspace/courses/CoursesPlugin.kt +++ b/buildSrc/src/main/kotlin/school/courses/CoursesPlugin.kt @@ -1,13 +1,13 @@ -package workspace.courses +package school.courses import com.fasterxml.jackson.module.kotlin.readValue import org.gradle.api.DefaultTask import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.register -import workspace.WorkspaceUtils.yamlMapper -import workspace.courses.Courses.JSON_FILE -import workspace.courses.Courses.ROOT_NODE +import school.WorkspaceUtils.yamlMapper +import school.courses.Courses.JSON_FILE +import school.courses.Courses.ROOT_NODE import java.io.File class CoursesPlugin : Plugin { diff --git a/buildSrc/src/main/kotlin/workspace/courses/models.kt b/buildSrc/src/main/kotlin/school/courses/models.kt similarity index 84% rename from buildSrc/src/main/kotlin/workspace/courses/models.kt rename to buildSrc/src/main/kotlin/school/courses/models.kt index 318b915..415fc5b 100644 --- a/buildSrc/src/main/kotlin/workspace/courses/models.kt +++ b/buildSrc/src/main/kotlin/school/courses/models.kt @@ -1,4 +1,4 @@ -package workspace.courses +package school.courses data class DirectoryStructure( val files: List = emptyList(), val directories: Map = emptyMap() diff --git a/buildSrc/src/main/kotlin/school/database/DatabaseManager.kt b/buildSrc/src/main/kotlin/school/database/DatabaseManager.kt new file mode 100755 index 0000000..0d7133b --- /dev/null +++ b/buildSrc/src/main/kotlin/school/database/DatabaseManager.kt @@ -0,0 +1,3 @@ +package school.database + +object DatabaseManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/database/DatabasePlugin.kt b/buildSrc/src/main/kotlin/school/database/DatabasePlugin.kt similarity index 95% rename from buildSrc/src/main/kotlin/workspace/database/DatabasePlugin.kt rename to buildSrc/src/main/kotlin/school/database/DatabasePlugin.kt index b2d9cb1..7026d7f 100755 --- a/buildSrc/src/main/kotlin/workspace/database/DatabasePlugin.kt +++ b/buildSrc/src/main/kotlin/school/database/DatabasePlugin.kt @@ -1,4 +1,4 @@ -package workspace.database +package school.database import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/school/database/models.kt b/buildSrc/src/main/kotlin/school/database/models.kt new file mode 100755 index 0000000..3a342dc --- /dev/null +++ b/buildSrc/src/main/kotlin/school/database/models.kt @@ -0,0 +1,2 @@ +package school.database + diff --git a/buildSrc/src/main/kotlin/workspace/forms/FormManager.kt b/buildSrc/src/main/kotlin/school/forms/FormManager.kt similarity index 92% rename from buildSrc/src/main/kotlin/workspace/forms/FormManager.kt rename to buildSrc/src/main/kotlin/school/forms/FormManager.kt index dc057aa..f739c85 100755 --- a/buildSrc/src/main/kotlin/workspace/forms/FormManager.kt +++ b/buildSrc/src/main/kotlin/school/forms/FormManager.kt @@ -1,8 +1,8 @@ -package workspace.forms +package school.forms import org.gradle.api.Project -import workspace.Office -import workspace.WorkspaceManager.workspaceEither +import school.Office +import school.WorkspaceManager.workspaceEither import java.io.IOException import java.util.* diff --git a/buildSrc/src/main/kotlin/workspace/forms/FormPlugin.kt b/buildSrc/src/main/kotlin/school/forms/FormPlugin.kt similarity index 91% rename from buildSrc/src/main/kotlin/workspace/forms/FormPlugin.kt rename to buildSrc/src/main/kotlin/school/forms/FormPlugin.kt index b8e1877..8aabb83 100755 --- a/buildSrc/src/main/kotlin/workspace/forms/FormPlugin.kt +++ b/buildSrc/src/main/kotlin/school/forms/FormPlugin.kt @@ -1,8 +1,8 @@ -package workspace.forms +package school.forms import org.gradle.api.Plugin import org.gradle.api.Project -import workspace.forms.FormManager.formAccessToken +import school.forms.FormManager.formAccessToken const val CRED="/Workspace/Bibliotheque/projects/forms_generator/private/training-institut-2598582b592a.json" diff --git a/buildSrc/src/main/kotlin/workspace/forms/GoogleFormsManager.kt b/buildSrc/src/main/kotlin/school/forms/GoogleFormsManager.kt similarity index 52% rename from buildSrc/src/main/kotlin/workspace/forms/GoogleFormsManager.kt rename to buildSrc/src/main/kotlin/school/forms/GoogleFormsManager.kt index 637fab9..e493da8 100755 --- a/buildSrc/src/main/kotlin/workspace/forms/GoogleFormsManager.kt +++ b/buildSrc/src/main/kotlin/school/forms/GoogleFormsManager.kt @@ -1,3 +1,3 @@ -package workspace.forms +package school.forms object GoogleFormsManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/forms/models.kt b/buildSrc/src/main/kotlin/school/forms/models.kt similarity index 85% rename from buildSrc/src/main/kotlin/workspace/forms/models.kt rename to buildSrc/src/main/kotlin/school/forms/models.kt index 195c751..9b0233b 100755 --- a/buildSrc/src/main/kotlin/workspace/forms/models.kt +++ b/buildSrc/src/main/kotlin/school/forms/models.kt @@ -1,4 +1,4 @@ -package workspace.forms +package school.forms data class Personna(val nom: String, val prenom: String, val age: Int) diff --git a/buildSrc/src/main/kotlin/workspace/git/datas.kt b/buildSrc/src/main/kotlin/school/git/datas.kt similarity index 96% rename from buildSrc/src/main/kotlin/workspace/git/datas.kt rename to buildSrc/src/main/kotlin/school/git/datas.kt index cbe36bc..5db52a1 100755 --- a/buildSrc/src/main/kotlin/workspace/git/datas.kt +++ b/buildSrc/src/main/kotlin/school/git/datas.kt @@ -1,4 +1,4 @@ -package workspace.git +package school.git import org.eclipse.jgit.revwalk.RevCommit import org.eclipse.jgit.transport.PushResult diff --git a/buildSrc/src/main/kotlin/workspace/git/models.kt b/buildSrc/src/main/kotlin/school/git/models.kt similarity index 95% rename from buildSrc/src/main/kotlin/workspace/git/models.kt rename to buildSrc/src/main/kotlin/school/git/models.kt index d24f0b3..f85aef9 100644 --- a/buildSrc/src/main/kotlin/workspace/git/models.kt +++ b/buildSrc/src/main/kotlin/school/git/models.kt @@ -1,4 +1,4 @@ -package workspace.git +package school.git object RepositoryInfo { const val ORIGIN = "origin" diff --git a/buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesManager.kt b/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt similarity index 85% rename from buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesManager.kt rename to buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt index 75e5b40..e6eadd1 100644 --- a/buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesManager.kt +++ b/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesManager.kt @@ -1,13 +1,13 @@ -package workspace.jbake +package school.jbake import org.gradle.api.Project -import workspace.git.FileOperationResult -import workspace.git.FileOperationResult.Failure -import workspace.git.FileOperationResult.Success -import workspace.git.RepositoryInfo.CNAME -import workspace.WorkspaceManager.bakeDestDirPath -import workspace.WorkspaceManager.localConf -import workspace.WorkspaceUtils.sep +import school.git.FileOperationResult +import school.git.FileOperationResult.Failure +import school.git.FileOperationResult.Success +import school.git.RepositoryInfo.CNAME +import school.WorkspaceManager.bakeDestDirPath +import school.WorkspaceManager.localConf +import school.WorkspaceUtils.sep import java.io.File import java.nio.charset.StandardCharsets.UTF_8 diff --git a/buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesPlugin.kt b/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesPlugin.kt similarity index 98% rename from buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesPlugin.kt rename to buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesPlugin.kt index 3a1d9b0..4e4eef1 100644 --- a/buildSrc/src/main/kotlin/workspace/jbake/JBakeGhPagesPlugin.kt +++ b/buildSrc/src/main/kotlin/school/jbake/JBakeGhPagesPlugin.kt @@ -1,4 +1,4 @@ -package workspace.jbake +package school.jbake import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/workspace/jbake/models.kt b/buildSrc/src/main/kotlin/school/jbake/models.kt similarity index 83% rename from buildSrc/src/main/kotlin/workspace/jbake/models.kt rename to buildSrc/src/main/kotlin/school/jbake/models.kt index abdd096..daef8b7 100644 --- a/buildSrc/src/main/kotlin/workspace/jbake/models.kt +++ b/buildSrc/src/main/kotlin/school/jbake/models.kt @@ -1,6 +1,6 @@ -package workspace.jbake +package school.jbake -import workspace.git.GitPushConfiguration +import school.git.GitPushConfiguration //object SiteInfo{} diff --git a/buildSrc/src/main/kotlin/workspace/models.kt b/buildSrc/src/main/kotlin/school/models.kt similarity index 98% rename from buildSrc/src/main/kotlin/workspace/models.kt rename to buildSrc/src/main/kotlin/school/models.kt index 5e5463d..6e83a10 100755 --- a/buildSrc/src/main/kotlin/workspace/models.kt +++ b/buildSrc/src/main/kotlin/school/models.kt @@ -1,4 +1,4 @@ -package workspace +package school /** - Ajouter une paire clé/map au bout du chemin de clé dans un list diff --git a/buildSrc/src/main/kotlin/school/projects/ProjectManager.kt b/buildSrc/src/main/kotlin/school/projects/ProjectManager.kt new file mode 100755 index 0000000..fd1e000 --- /dev/null +++ b/buildSrc/src/main/kotlin/school/projects/ProjectManager.kt @@ -0,0 +1,3 @@ +package school.projects + +object ProjectManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/projects/ProjectPlugin.kt b/buildSrc/src/main/kotlin/school/projects/ProjectPlugin.kt similarity index 94% rename from buildSrc/src/main/kotlin/workspace/projects/ProjectPlugin.kt rename to buildSrc/src/main/kotlin/school/projects/ProjectPlugin.kt index a0cb9fe..c24beab 100755 --- a/buildSrc/src/main/kotlin/workspace/projects/ProjectPlugin.kt +++ b/buildSrc/src/main/kotlin/school/projects/ProjectPlugin.kt @@ -1,4 +1,4 @@ -package workspace.projects +package school.projects import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/school/projects/models.kt b/buildSrc/src/main/kotlin/school/projects/models.kt new file mode 100755 index 0000000..9d7b143 --- /dev/null +++ b/buildSrc/src/main/kotlin/school/projects/models.kt @@ -0,0 +1,2 @@ +package school.projects + diff --git a/buildSrc/src/main/kotlin/workspace/school/SchoolContentManager.kt b/buildSrc/src/main/kotlin/school/school/SchoolContentManager.kt similarity index 91% rename from buildSrc/src/main/kotlin/workspace/school/SchoolContentManager.kt rename to buildSrc/src/main/kotlin/school/school/SchoolContentManager.kt index 2ce4f4b..1605bc4 100755 --- a/buildSrc/src/main/kotlin/workspace/school/SchoolContentManager.kt +++ b/buildSrc/src/main/kotlin/school/school/SchoolContentManager.kt @@ -1,7 +1,7 @@ -package workspace.school +package school.school import org.apache.poi.xwpf.usermodel.XWPFDocument -import workspace.WorkspaceUtils +import school.WorkspaceUtils import java.io.File import java.io.FileInputStream @@ -10,7 +10,7 @@ object SchoolContentManager { val DOSSIER_PROFESSIONNELLE_PATH by lazy { "${WorkspaceUtils.sep}projects${WorkspaceUtils.sep}school${WorkspaceUtils.sep}rsrc${WorkspaceUtils.sep}docs${WorkspaceUtils.sep}dossier_professionnel_titre.docx" } fun printDossierProfessionnelle(projectDir: File) = projectDir.absolutePath .plus(DOSSIER_PROFESSIONNELLE_PATH) - .apply(::printDocxStructure) + .apply(SchoolContentManager::printDocxStructure) .run(::println) @Suppress("MemberVisibilityCanBePrivate") diff --git a/buildSrc/src/main/kotlin/workspace/school/SchoolOpsManager.kt b/buildSrc/src/main/kotlin/school/school/SchoolOpsManager.kt similarity index 86% rename from buildSrc/src/main/kotlin/workspace/school/SchoolOpsManager.kt rename to buildSrc/src/main/kotlin/school/school/SchoolOpsManager.kt index 36996da..9c10f96 100755 --- a/buildSrc/src/main/kotlin/workspace/school/SchoolOpsManager.kt +++ b/buildSrc/src/main/kotlin/school/school/SchoolOpsManager.kt @@ -1,15 +1,16 @@ -package workspace.school +package school.school import com.github.gradle.node.NodeExtension import org.gradle.api.Project import org.gradle.kotlin.dsl.getByType -import workspace.Office -import workspace.WorkspaceManager.bakeDestDirPath -import workspace.WorkspaceManager.isCnameExists -import workspace.WorkspaceManager.localConf -import workspace.WorkspaceManager.pushSiteToGhPages -import workspace.WorkspaceManager.workspaceEither -import workspace.WorkspaceUtils +import school.Office +import school.WorkspaceManager.DNS_CNAME +import school.WorkspaceManager.bakeDestDirPath +import school.WorkspaceManager.isCnameExists +import school.WorkspaceManager.localConf +import school.WorkspaceManager.pushSiteToGhPages +import school.WorkspaceManager.workspaceEither +import school.WorkspaceUtils.sep import java.io.File import java.nio.charset.StandardCharsets.UTF_8 @@ -46,7 +47,7 @@ object SchoolOpsManager { fun NodeExtension.schoolFrontendDir( workspace: Office - ): Unit = workspace.let(::schoolFrontendPath) + ): Unit = workspace.let(SchoolOpsManager::schoolFrontendPath) .let(::File) .let(nodeProjectDir::set) @@ -69,10 +70,10 @@ object SchoolOpsManager { .let { project.nodeDirSchoolFrontend(it) } fun Project.schoolFrontendBakeDestDirPath(): () -> String = - { "${buildDir.absolutePath}${WorkspaceUtils.sep}$bakeDestDirPath" } + { "${buildDir.absolutePath}$sep$bakeDestDirPath" } fun Project.schoolFrontendPathTo(): () -> String = - { "${buildDir.absolutePath}${WorkspaceUtils.sep}${localConf.pushPage.to}" } + { "${buildDir.absolutePath}$sep${localConf.pushPage.to}" } fun Project.isSchoolFrontendCnameExists( workspace: Office @@ -104,7 +105,7 @@ object SchoolOpsManager { ?.get("cname") as String? return when { cname.isNullOrBlank() -> null - else -> "$path${WorkspaceUtils.sep}$from${WorkspaceUtils.sep}${workspace.WorkspaceManager.DNS_CNAME}" + else -> "$path$sep$from$sep$DNS_CNAME" } } diff --git a/buildSrc/src/main/kotlin/workspace/school/SchoolPlugin.kt b/buildSrc/src/main/kotlin/school/school/SchoolPlugin.kt similarity index 95% rename from buildSrc/src/main/kotlin/workspace/school/SchoolPlugin.kt rename to buildSrc/src/main/kotlin/school/school/SchoolPlugin.kt index 9c80237..f90520b 100755 --- a/buildSrc/src/main/kotlin/workspace/school/SchoolPlugin.kt +++ b/buildSrc/src/main/kotlin/school/school/SchoolPlugin.kt @@ -1,19 +1,19 @@ -package workspace.school +package school.school import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.tasks.compile.JavaCompile -import workspace.WorkspaceManager.TASK_PUBLISH_SITE -import workspace.WorkspaceManager.initWorkspace -import workspace.WorkspaceManager.initialConf -import workspace.WorkspaceManager.printConf -import workspace.WorkspaceUtils -import workspace.WorkspaceUtils.lsWorkingDir -import workspace.WorkspaceUtils.yamlMapper -import workspace.school.SchoolOpsManager.fixEncodage -import workspace.school.SchoolOpsManager.loadSchoolFrontend -import workspace.school.SchoolOpsManager.processSchoolFrontendCnameFile -import workspace.school.SchoolOpsManager.pushSchoolFrontendPages +import school.WorkspaceManager.TASK_PUBLISH_SITE +import school.WorkspaceManager.initWorkspace +import school.WorkspaceManager.initialConf +import school.WorkspaceManager.printConf +import school.WorkspaceUtils +import school.WorkspaceUtils.lsWorkingDir +import school.WorkspaceUtils.yamlMapper +import school.school.SchoolOpsManager.fixEncodage +import school.school.SchoolOpsManager.loadSchoolFrontend +import school.school.SchoolOpsManager.processSchoolFrontendCnameFile +import school.school.SchoolOpsManager.pushSchoolFrontendPages import java.lang.System.getenv import java.nio.charset.StandardCharsets.UTF_8 diff --git a/buildSrc/src/main/kotlin/workspace/school/models.kt b/buildSrc/src/main/kotlin/school/school/models.kt similarity index 98% rename from buildSrc/src/main/kotlin/workspace/school/models.kt rename to buildSrc/src/main/kotlin/school/school/models.kt index f9e1772..5d91c46 100755 --- a/buildSrc/src/main/kotlin/workspace/school/models.kt +++ b/buildSrc/src/main/kotlin/school/school/models.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package workspace.school +package school.school data class Formation( val nom: String, diff --git a/buildSrc/src/main/kotlin/workspace/slides/SlidesManager.kt b/buildSrc/src/main/kotlin/school/slides/SlidesManager.kt similarity index 89% rename from buildSrc/src/main/kotlin/workspace/slides/SlidesManager.kt rename to buildSrc/src/main/kotlin/school/slides/SlidesManager.kt index c511a0b..fa46d25 100755 --- a/buildSrc/src/main/kotlin/workspace/slides/SlidesManager.kt +++ b/buildSrc/src/main/kotlin/school/slides/SlidesManager.kt @@ -1,11 +1,11 @@ -package workspace.slides +package school.slides import org.gradle.api.Project -import workspace.git.FileOperationResult -import workspace.WorkspaceManager -import workspace.WorkspaceManager.initAddCommitToSite -import workspace.WorkspaceManager.localConf -import workspace.WorkspaceManager.pushSite +import school.git.FileOperationResult +import school.WorkspaceManager +import school.WorkspaceManager.initAddCommitToSite +import school.WorkspaceManager.localConf +import school.WorkspaceManager.pushSite import java.io.File import java.util.* diff --git a/buildSrc/src/main/kotlin/workspace/slides/SlidesPlugin.kt b/buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt similarity index 96% rename from buildSrc/src/main/kotlin/workspace/slides/SlidesPlugin.kt rename to buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt index 3f46a0b..f0742e9 100755 --- a/buildSrc/src/main/kotlin/workspace/slides/SlidesPlugin.kt +++ b/buildSrc/src/main/kotlin/school/slides/SlidesPlugin.kt @@ -1,4 +1,4 @@ -package workspace.slides +package school.slides import org.asciidoctor.gradle.jvm.AsciidoctorTask import org.gradle.api.DefaultTask @@ -7,9 +7,9 @@ import org.gradle.api.Project import org.gradle.api.tasks.Exec import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.repositories -import workspace.WorkspaceManager.printConf -import workspace.slides.SlidesManager.deckFile -import workspace.slides.SlidesManager.slideSrcPath +import school.WorkspaceManager.printConf +import school.slides.SlidesManager.deckFile +import school.slides.SlidesManager.slideSrcPath import java.io.File class SlidesPlugin : Plugin { diff --git a/buildSrc/src/main/kotlin/workspace/slides/models.kt b/buildSrc/src/main/kotlin/school/slides/models.kt similarity index 64% rename from buildSrc/src/main/kotlin/workspace/slides/models.kt rename to buildSrc/src/main/kotlin/school/slides/models.kt index 351a4ca..2e9518d 100755 --- a/buildSrc/src/main/kotlin/workspace/slides/models.kt +++ b/buildSrc/src/main/kotlin/school/slides/models.kt @@ -1,6 +1,6 @@ -package workspace.slides +package school.slides -import workspace.git.GitPushConfiguration +import school.git.GitPushConfiguration @Suppress("unused") data class SlidesConfiguration( diff --git a/buildSrc/src/main/kotlin/school/training/EvaluationManager.kt b/buildSrc/src/main/kotlin/school/training/EvaluationManager.kt new file mode 100755 index 0000000..e950a43 --- /dev/null +++ b/buildSrc/src/main/kotlin/school/training/EvaluationManager.kt @@ -0,0 +1,3 @@ +package school.training + +object EvaluationManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/training/EvaluationPlugin.kt b/buildSrc/src/main/kotlin/school/training/EvaluationPlugin.kt similarity index 86% rename from buildSrc/src/main/kotlin/workspace/training/EvaluationPlugin.kt rename to buildSrc/src/main/kotlin/school/training/EvaluationPlugin.kt index f6796d4..88260b8 100755 --- a/buildSrc/src/main/kotlin/workspace/training/EvaluationPlugin.kt +++ b/buildSrc/src/main/kotlin/school/training/EvaluationPlugin.kt @@ -1,4 +1,4 @@ -package workspace.training +package school.training import org.gradle.api.Plugin import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/school/training/models.kt b/buildSrc/src/main/kotlin/school/training/models.kt new file mode 100755 index 0000000..54ceb29 --- /dev/null +++ b/buildSrc/src/main/kotlin/school/training/models.kt @@ -0,0 +1,2 @@ +package school.training + diff --git a/buildSrc/src/main/kotlin/workspace/ai/models.kt b/buildSrc/src/main/kotlin/workspace/ai/models.kt deleted file mode 100755 index 88dedc8..0000000 --- a/buildSrc/src/main/kotlin/workspace/ai/models.kt +++ /dev/null @@ -1,2 +0,0 @@ -package workspace.ai - diff --git a/buildSrc/src/main/kotlin/workspace/database/DatabaseManager.kt b/buildSrc/src/main/kotlin/workspace/database/DatabaseManager.kt deleted file mode 100755 index c278836..0000000 --- a/buildSrc/src/main/kotlin/workspace/database/DatabaseManager.kt +++ /dev/null @@ -1,3 +0,0 @@ -package workspace.database - -object DatabaseManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/database/models.kt b/buildSrc/src/main/kotlin/workspace/database/models.kt deleted file mode 100755 index f5438a1..0000000 --- a/buildSrc/src/main/kotlin/workspace/database/models.kt +++ /dev/null @@ -1,2 +0,0 @@ -package workspace.database - diff --git a/buildSrc/src/main/kotlin/workspace/projects/ProjectManager.kt b/buildSrc/src/main/kotlin/workspace/projects/ProjectManager.kt deleted file mode 100755 index d26498d..0000000 --- a/buildSrc/src/main/kotlin/workspace/projects/ProjectManager.kt +++ /dev/null @@ -1,3 +0,0 @@ -package workspace.projects - -object ProjectManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/projects/models.kt b/buildSrc/src/main/kotlin/workspace/projects/models.kt deleted file mode 100755 index 6060b46..0000000 --- a/buildSrc/src/main/kotlin/workspace/projects/models.kt +++ /dev/null @@ -1,2 +0,0 @@ -package workspace.projects - diff --git a/buildSrc/src/main/kotlin/workspace/training/EvaluationManager.kt b/buildSrc/src/main/kotlin/workspace/training/EvaluationManager.kt deleted file mode 100755 index 7ea577f..0000000 --- a/buildSrc/src/main/kotlin/workspace/training/EvaluationManager.kt +++ /dev/null @@ -1,3 +0,0 @@ -package workspace.training - -object EvaluationManager \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/workspace/training/models.kt b/buildSrc/src/main/kotlin/workspace/training/models.kt deleted file mode 100755 index f1092e1..0000000 --- a/buildSrc/src/main/kotlin/workspace/training/models.kt +++ /dev/null @@ -1,2 +0,0 @@ -package workspace.training - diff --git a/buildSrc/src/test/kotlin/workspace/PluginTests.kt b/buildSrc/src/test/kotlin/workspace/PluginTests.kt index be24e7e..f66514b 100755 --- a/buildSrc/src/test/kotlin/workspace/PluginTests.kt +++ b/buildSrc/src/test/kotlin/workspace/PluginTests.kt @@ -3,10 +3,12 @@ package workspace import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.testfixtures.ProjectBuilder -import workspace.forms.FormPlugin -import workspace.jbake.JBakeGhPagesPlugin -import workspace.school.SchoolPlugin -import workspace.school.SchoolPlugin.Companion.TASK_HELLO +import school.Office +import school.OfficeEntry +import school.forms.FormPlugin +import school.jbake.JBakeGhPagesPlugin +import school.school.SchoolPlugin +import school.school.SchoolPlugin.Companion.TASK_HELLO import java.io.ByteArrayOutputStream import java.io.PrintStream import java.lang.System.out diff --git a/formation/build.gradle.kts b/formation/build.gradle.kts index 708bcc3..9b2f26a 100755 --- a/formation/build.gradle.kts +++ b/formation/build.gradle.kts @@ -1,39 +1,39 @@ import org.asciidoctor.gradle.jvm.slides.AsciidoctorJRevealJSTask -import workspace.WorkspaceManager.GROUP_TASK_SITE -import workspace.WorkspaceManager.TASK_BAKE_SITE -import workspace.WorkspaceManager.TASK_PUBLISH_SITE -import workspace.WorkspaceManager.bakeDestDirPath -import workspace.WorkspaceManager.bakeSrcPath -import workspace.WorkspaceManager.pushSiteToGhPages -import workspace.WorkspaceUtils.sep -import workspace.jbake.JBakeGhPagesManager.createCnameFile -import workspace.jbake.JBakeGhPagesManager.sitePushDestPath -import workspace.jbake.JBakeGhPagesManager.sitePushPathTo -import workspace.slides.SlidesPlugin.RevealJsSlides.BUILD_GRADLE_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.CODERAY_CSS_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.DOCINFO_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.ENDPOINT_URL_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.GROUP_TASK_SLIDER -import workspace.slides.SlidesPlugin.RevealJsSlides.ICONS_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.IDPREFIX_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.IDSEPARATOR_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.IMAGEDIR_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.REVEALJS_HISTORY_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.REVEALJS_SLIDENUMBER_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.REVEALJS_THEME_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.REVEALJS_TRANSITION_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.SETANCHORS_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.SOURCE_HIGHLIGHTER_KEY -import workspace.slides.SlidesPlugin.RevealJsSlides.TASK_ASCIIDOCTOR_REVEALJS -import workspace.slides.SlidesPlugin.RevealJsSlides.TASK_CLEAN_SLIDES_BUILD -import workspace.slides.SlidesPlugin.RevealJsSlides.TOC_KEY +import school.WorkspaceManager.GROUP_TASK_SITE +import school.WorkspaceManager.TASK_BAKE_SITE +import school.WorkspaceManager.TASK_PUBLISH_SITE +import school.WorkspaceManager.bakeDestDirPath +import school.WorkspaceManager.bakeSrcPath +import school.WorkspaceManager.pushSiteToGhPages +import school.WorkspaceUtils.sep +import school.jbake.JBakeGhPagesManager.createCnameFile +import school.jbake.JBakeGhPagesManager.sitePushDestPath +import school.jbake.JBakeGhPagesManager.sitePushPathTo +import school.slides.SlidesPlugin.RevealJsSlides.BUILD_GRADLE_KEY +import school.slides.SlidesPlugin.RevealJsSlides.CODERAY_CSS_KEY +import school.slides.SlidesPlugin.RevealJsSlides.DOCINFO_KEY +import school.slides.SlidesPlugin.RevealJsSlides.ENDPOINT_URL_KEY +import school.slides.SlidesPlugin.RevealJsSlides.GROUP_TASK_SLIDER +import school.slides.SlidesPlugin.RevealJsSlides.ICONS_KEY +import school.slides.SlidesPlugin.RevealJsSlides.IDPREFIX_KEY +import school.slides.SlidesPlugin.RevealJsSlides.IDSEPARATOR_KEY +import school.slides.SlidesPlugin.RevealJsSlides.IMAGEDIR_KEY +import school.slides.SlidesPlugin.RevealJsSlides.REVEALJS_HISTORY_KEY +import school.slides.SlidesPlugin.RevealJsSlides.REVEALJS_SLIDENUMBER_KEY +import school.slides.SlidesPlugin.RevealJsSlides.REVEALJS_THEME_KEY +import school.slides.SlidesPlugin.RevealJsSlides.REVEALJS_TRANSITION_KEY +import school.slides.SlidesPlugin.RevealJsSlides.SETANCHORS_KEY +import school.slides.SlidesPlugin.RevealJsSlides.SOURCE_HIGHLIGHTER_KEY +import school.slides.SlidesPlugin.RevealJsSlides.TASK_ASCIIDOCTOR_REVEALJS +import school.slides.SlidesPlugin.RevealJsSlides.TASK_CLEAN_SLIDES_BUILD +import school.slides.SlidesPlugin.RevealJsSlides.TOC_KEY plugins { id("org.jbake.site") id("org.asciidoctor.jvm.revealjs") } -apply() -apply() +apply() +apply() repositories { ruby { gems() } } diff --git a/school-gradle-plugin/build.gradle.kts b/school-gradle-plugin/build.gradle.kts index a411f8f..6f91d81 100755 --- a/school-gradle-plugin/build.gradle.kts +++ b/school-gradle-plugin/build.gradle.kts @@ -1,12 +1,12 @@ -import workspace.WorkspaceUtils.purchaseArtifact +import school.WorkspaceUtils.purchaseArtifact plugins { id("com.github.node-gradle.node") id("com.avast.gradle.docker-compose") } -apply() -apply() +apply() +apply() purchaseArtifact()