Merge pull request #34 from hexagontk/develop

Update documentation and dependencies
hexagontk · Apr 12, 2024 · b615553 · b615553
2 parents e988c40 + 4c69355
commit b615553
Show file tree

Hide file tree

Showing 29 changed files with 95 additions and 80 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,6 +5,6 @@ on:
 
 jobs:
   build:
-    uses: hexagonkt/.github/.github/workflows/graalvm_gradle.yml@master
+    uses: hexagontk/.github/.github/workflows/graalvm_gradle.yml@master
     permissions:
       contents: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,6 @@ on:
 
 jobs:
   release:
-    uses: hexagonkt/.github/.github/workflows/gradle.yml@master
+    uses: hexagontk/.github/.github/workflows/gradle.yml@master
     with:
       tasks: release
diff --git a/.gitignore b/.gitignore
@@ -40,9 +40,7 @@ hs_err_pid*
 # Other Tools
 kotlin-js-store/
 node_modules/
-package-lock.json
 .env
-.sdkmanrc
 
 # System Files
 .DS_Store

diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=21.0.2-graalce
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Here you can see a [3 min quick demo](https://youtu.be/t4aOSJibuzs).
 > development tools.
 
 ## 💻 Install
-1. Download the latest binary from the [releases page](https://github.com/hexagonkt/codecv/releases)
+1. Download the latest binary from the [releases page](https://github.com/hexagontk/codecv/releases)
 2. Copy or link the binary to a directory in the PATH
 3. Type `codecv --help` to check how to use the reference tool
 
@@ -49,7 +49,7 @@ requirement.
 
 ## 📄 CV Format Schema
 The CV JSON schema is located at [/cv.schema.json](/cv.schema.json). The URL to use on the CVs will
-be: `https://raw.githubusercontent.com/hexagonkt/codecv/<version>/cv.schema.json`. Being `version`
+be: `https://raw.githubusercontent.com/hexagontk/codecv/<version>/cv.schema.json`. Being `version`
 the schema version (`master` can be used to link to the latest published version).
 
 The schema can be used to validate documents in different formats (YAML, JSON and TOML at the
@@ -123,16 +123,16 @@ improvement, file a bug or resolve a usage doubt, you are absolutely encouraged
 Also, if you want to contribute a new feature on the tool or a change on the schema. You can also
 do so by creating an issue and filing a PR. Please read the [contributing guide] before doing so.
 
-[contributing guide]: https://github.com/hexagonkt/codecv/contribute
+[contributing guide]: https://github.com/hexagontk/codecv/contribute
 
 ## ❤️ Support the Project
 If you want to see more progress on this project, and see more developer targeted tools,
 spread the word on social networks! and don't forget to give it a ⭐!
 
 To be notified on updates or new tools developed within the Hexagon organization. Follow the Twitter
-account ([@hexagon_tk]) and the [GitHub organization].
+account ([@hexagontk]) and the [GitHub organization].
 
 Thanks for your support!
 
-[@hexagon_tk]: https://twitter.com/hexagon_kt
+[@hexagontk]: https://twitter.com/hexagontk
 [GitHub organization]: https://github.com/hexagonkt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,19 +4,20 @@ import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
 import java.lang.System.getProperty
 
 plugins {
-    kotlin("jvm") version("1.9.20")
-    id("org.graalvm.buildtools.native") version("0.9.28")
+    kotlin("jvm") version("1.9.23")
+    id("org.graalvm.buildtools.native") version("0.10.1")
 }
 
 val os = getProperty("os.name").lowercase()
 
-val hexagonVersion = "3.4.1"
-val hexagonExtraVersion = "3.4.1"
-val vertxVersion = "4.4.6"
+val hexagonVersion = "3.5.3"
+val hexagonExtraVersion = "3.4.6"
+val vertxVersion = "4.5.6"
+val slf4jVersion = "2.0.12"
 
-val gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/$hexagonVersion/gradle"
+val gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle"
 
-ext.set("modules", "java.logging,java.desktop")
+ext.set("modules", "java.logging")
 ext.set("options", "-Xmx32m")
 ext.set("icon", "$projectDir/logo.png")
 ext.set("applicationClass", "co.codecv.CvKt")
@@ -26,15 +27,14 @@ apply(from = "$gradleScripts/application.gradle")
 apply(from = "$gradleScripts/native.gradle")
 
 group = "com.hexagonkt.tools"
-version = "0.9.23"
+version = "0.9.24"
 description = "CVs for programmers"
 
 if (current() !in setOf(VERSION_17, VERSION_18, VERSION_19, VERSION_20, VERSION_21))
     error("This build must be run with JDK 17+. Current: ${current()}")
 
 dependencies {
     "implementation"("com.hexagonkt:http_server_netty:$hexagonVersion")
-    "implementation"("com.hexagonkt:logging_slf4j_jul:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_json:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_yaml:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_toml:$hexagonVersion")
@@ -43,6 +43,9 @@ dependencies {
     "implementation"("com.hexagonkt.extra:args:$hexagonExtraVersion")
 
     "implementation"("io.vertx:vertx-json-schema:$vertxVersion")
+    "implementation"("org.slf4j:log4j-over-slf4j:$slf4jVersion")
+    "implementation"("org.slf4j:jcl-over-slf4j:$slf4jVersion")
+    "implementation"("org.slf4j:slf4j-jdk14:$slf4jVersion")
 
     "testImplementation"("com.hexagonkt:http_client_jetty:$hexagonVersion")
 }
@@ -89,6 +92,6 @@ tasks.create("release") {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.4"
+    gradleVersion = "8.7"
     distributionType = ALL
 }
diff --git a/cv.schema.json b/cv.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema" : "https://json-schema.org/draft-04/schema",
-  "$id" : "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json",
+  "$id" : "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json",
   "$ref" : "#/$defs/Cv",
   "$defs" : {
     "Language" : {

diff --git a/examples/cv.html b/examples/cv.html
@@ -444,7 +444,7 @@ <h2><i class="fas fa-paint-brush"></i> Common Skills</h2>
 <footer class="is-center">
   <p>
     Created by <a href="mailto:{{ cv.contact.email }}">{{ cv.personal.alias }}</a>
-    with <a href="https://hexagonkt.com/">Hexagon</a>
+    with <a href="https://hexagontk.com/">Hexagon</a>
     and <a href="https://jenil.github.io/chota">chota</a>
     · © {{ _now_.year }}
 

diff --git a/examples/full.cv.json b/examples/full.cv.json
@@ -1,5 +1,5 @@
 {
-  "$schema" : "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json",
+  "$schema" : "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json",
 
   "Job Status" : "not moving",
 
@@ -110,7 +110,7 @@
   ],
 
   "Links" : [
-    { "Address" : "https://github.com/hexagonkt/hexagon" },
+    { "Address" : "https://github.com/hexagontk/hexagon" },
     { "Address" : "https://twitter.com/hexagon_kt" },
     { "Address" : "https://dev.to/hexagonkt" }
   ],
@@ -283,7 +283,7 @@
         { "Address" : "tel:+1-91-106-28-01", "Title" : "Landline" },
         { "Address" : "mailto:[email protected]", "Title" : "Email", "Tags" : [ "Work" ] }
       ],
-      "Social Profiles" : [ "https://github.com/hexagonkt/hexagon" ],
+      "Social Profiles" : [ "https://github.com/hexagontk/hexagon" ],
       "Projects" : [ "middle-out" ]
     }
   ],

diff --git a/examples/full.cv.toml b/examples/full.cv.toml
@@ -1,6 +1,6 @@
 #!/usr/bin/env codecv
 
-"$schema" = "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json"
+"$schema" = "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json"
 
 "Job Status" = "not moving"
 "Last Update" = 2022-12-27
@@ -33,7 +33,7 @@ Goals = [
 ]
 
 Links = [
-  { Address = "https://github.com/hexagonkt/hexagon" },
+  { Address = "https://github.com/hexagontk/hexagon" },
   { Address = "https://twitter.com/hexagon_kt" },
   { Address = "https://dev.to/hexagonkt" },
 ]
@@ -226,7 +226,7 @@ Issuer.Name = "Hooli"
 
 [[References]]
 "Full Name" = "Erlich Bachman"
-"Social Profiles" = [ "https://github.com/hexagonkt/hexagon" ]
+"Social Profiles" = [ "https://github.com/hexagontk/hexagon" ]
 Type = "manager"
 Projects = [ "middle-out" ]
 Summary = """\

diff --git a/examples/full.cv.yml b/examples/full.cv.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env codecv
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Job Status: not moving
 
@@ -100,7 +100,7 @@ Top Skills:
   - Low level Programming
 
 Links:
-  - Address: https://github.com/hexagonkt/hexagon
+  - Address: https://github.com/hexagontk/hexagon
   - Address: https://twitter.com/hexagon_kt
   - Address: https://dev.to/hexagonkt
 
@@ -237,7 +237,7 @@ References:
       - Address: mailto:[email protected]
         Title: Email
         Tags: [ Work ]
-    Social Profiles: [ https://github.com/hexagonkt/hexagon ]
+    Social Profiles: [ https://github.com/hexagontk/hexagon ]
     Projects: [ middle-out ]
 
 Technical Skills:

diff --git a/examples/minimum.cv.json b/examples/minimum.cv.json
@@ -1,5 +1,5 @@
 {
-  "$schema" : "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json",
+  "$schema" : "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json",
 
   "Locale" : "en",
 

diff --git a/examples/minimum.cv.toml b/examples/minimum.cv.toml
@@ -1,6 +1,6 @@
 #!/usr/bin/env codecv
 
-"$schema" = "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json"
+"$schema" = "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json"
 
 Locale = "en"
 

diff --git a/examples/minimum.cv.yml b/examples/minimum.cv.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env codecv
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Locale: en
 

diff --git a/examples/modular/additional_experiences.cv.yml b/examples/modular/additional_experiences.cv.yml
@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Personal Projects:
   - Title: Pied Piper

diff --git a/examples/modular/brief.cv.yml b/examples/modular/brief.cv.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env codecv
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Locale: en_US
 Resources: [ common.cv.yml ]

diff --git a/examples/modular/common.cv.yml b/examples/modular/common.cv.yml
@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Job Status: not moving
 Last Update: 2022-12-27
@@ -92,7 +92,7 @@ Top Skills:
 Links:
   - Title: Website
     Address: https://example.net
-  - Address: https://github.com/hexagonkt/hexagon
+  - Address: https://github.com/hexagontk/hexagon
   - Address: https://twitter.com/hexagon_kt
   - Address: https://dev.to/hexagonkt
 
@@ -187,7 +187,7 @@ References:
         Address: tel:+1-91-106-28-01
       - Title: Email
         Address: mailto:[email protected]
-    Social Profiles: [ https://github.com/hexagonkt/hexagon ]
+    Social Profiles: [ https://github.com/hexagontk/hexagon ]
     Projects: [ middle-out ]
 
 Technical Skills:

diff --git a/examples/modular/courses.cv.yml b/examples/modular/courses.cv.yml
@@ -1,6 +1,6 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Courses:
   - Title: Cloud Deployment and Monitoring

diff --git a/examples/modular/full.cv.yml b/examples/modular/full.cv.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env codecv
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Locale: en_US
 Resources:

diff --git a/examples/regular.cv.json b/examples/regular.cv.json
@@ -1,5 +1,5 @@
 {
-  "$schema" : "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json",
+  "$schema" : "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json",
 
   "Locale" : "en_US",
   "Templates" : [ "cv.html" ],
@@ -66,7 +66,7 @@
   ],
 
   "Links" : [
-    { "Address" : "https://github.com/hexagonkt/hexagon" },
+    { "Address" : "https://github.com/hexagontk/hexagon" },
     { "Address" : "https://twitter.com/hexagon_kt" },
     { "Address" : "https://dev.to/hexagonkt" }
   ],

diff --git a/examples/regular.cv.toml b/examples/regular.cv.toml
@@ -1,6 +1,6 @@
 #!/usr/bin/env codecv
 
-"$schema" = "https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json"
+"$schema" = "https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json"
 
 Locale = "en_US"
 Templates = [ "cv.html" ]
@@ -25,7 +25,7 @@ Goals = [
 ]
 
 Links = [
-  { Address = "https://github.com/hexagonkt/hexagon" },
+  { Address = "https://github.com/hexagontk/hexagon" },
   { Address = "https://twitter.com/hexagon_kt" },
   { Address = "https://dev.to/hexagonkt" },
 ]

diff --git a/examples/regular.cv.yml b/examples/regular.cv.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env codecv
-# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
-$schema: https://raw.githubusercontent.com/hexagonkt/codecv/master/cv.schema.json
+$schema: https://raw.githubusercontent.com/hexagontk/codecv/master/cv.schema.json
 
 Locale: en_US
 Templates: [ cv.html ]
@@ -64,7 +64,7 @@ Top Skills:
   - Low level Programming
 
 Links:
-  - Address: https://github.com/hexagonkt/hexagon
+  - Address: https://github.com/hexagontk/hexagon
   - Address: https://twitter.com/hexagon_kt
   - Address: https://dev.to/hexagonkt
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME