fix inst

build.py

@@ -150,12 +150,12 @@ def inst(project):
         shell=True,
         check=True,
     )
-    package_native(project)
     run(
         "sudo install -m=755 target/uberjar/" + project.name + "-standalone.jar /usr/local/bin/" + project.name + "-standalone.jar",
         shell=True,
         check=True,
     )
+    package_native(project)
     run(
         "sudo install -m=755 target/graalvm/" + project.name + " /usr/local/bin/" + project.name + "",
         shell=True,

infrastructure/backup/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = "c4k-forgejo"
 MODULE = "backup"
 PROJECT_ROOT_PATH = "../.."
-version = "4.1.2"
+version = "4.1.3-dev"
 
 
 @init

infrastructure/federated/build.py

@@ -6,7 +6,7 @@ from ddadevops import *
 name = 'c4k-forgejo'
 MODULE = 'federated'
 PROJECT_ROOT_PATH = '../..'
-version = "4.1.2"
+version = "4.1.3-dev"
 
 @init
 def initialize(project):

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-forgejo",
     "description": "Generate c4k yaml for a forgejo deployment.",
     "author": "meissa GmbH",
-    "version": "4.1.2",
+    "version": "4.1.3-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-forgejo#readme",
     "repository": "https://www.npmjs.com/package/c4k-forgejo",
     "license": "APACHE2",

project.clj

@@ -1,4 +1,4 @@
-(defproject org.domaindrivenarchitecture/c4k-forgejo "4.1.2"
+(defproject org.domaindrivenarchitecture/c4k-forgejo "4.1.3-SNAPSHOT"
   :description "forgejo c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"

src/main/clj/dda/c4k_forgejo/uberjar.clj

@@ -1,8 +1,8 @@
 (ns dda.c4k-forgejo.uberjar
   (:gen-class)
   (:require
-   [dda.c4k-forgejo.core :as core]
+   [dda.c4k-common.uberjar :as uberjar]
-   [dda.c4k-common.uberjar :as uberjar]))
+   [dda.c4k-forgejo.core :as core]))
 
 (set! *warn-on-reflection* true)
 

src/main/cljs/dda/c4k_forgejo/browser.cljs

@@ -1,9 +1,9 @@
 (ns dda.c4k-forgejo.browser
   (:require
    [clojure.tools.reader.edn :as edn]
-   [dda.c4k-forgejo.core :as core]
    [dda.c4k-common.browser :as br]
-   [dda.c4k-common.common :as cm]))
+   [dda.c4k-common.common :as cm]
+   [dda.c4k-forgejo.core :as core]))
 
 (defn generate-group
   [name

src/test/cljc/dda/c4k_forgejo/core_test.cljc

@@ -1,18 +1,19 @@
 (ns dda.c4k-forgejo.core-test
   (:require
-   #?(:cljs [shadow.resource :as rc])
    #?(:clj [clojure.test :refer [deftest is are testing run-tests]]
       :cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
    [clojure.spec.alpha :as s]
+   [clojure.spec.test.alpha :as st]
    [dda.c4k-common.yaml :as yaml]
-   [dda.c4k-forgejo.core :as cut]))
+   [dda.c4k-forgejo.core :as cut]
+    #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])))
+
+(st/instrument `cut/onfig-objects)
+(st/instrument `cut/auth-objects)
 
 #?(:cljs
    (defmethod yaml/load-resource :forgejo-test [resource-name]
-     (case resource-name
+     (get (inline-resources "forgejo-test") resource-name)))
-       "forgejo-test/valid-auth.yaml"   (rc/inline "forgejo-test/valid-auth.yaml")
-       "forgejo-test/valid-config.yaml" (rc/inline "forgejo-test/valid-config.yaml")
-       (throw (js/Error. "Undefined Resource!")))))
 
 (deftest validate-valid-resources
   (is (s/valid? cut/config? (yaml/load-as-edn "forgejo-test/valid-config.yaml")))