Merge pull request #159 from unisoncomputing/cp/packagify-share-api

Packagify share api

Author: ChrisPenner

Makefile

@@ -27,7 +27,7 @@ endif
 $(target_dir):
 	mkdir $@
 
-$(exe): $(shell find . unison -type f -name '*.hs') package.yaml stack.yaml
+$(exe): $(shell find . unison -type f -name '*.hs') $(shell find . unison -type f -name '*.yaml')
 	@echo $(exe)
 	@echo $@
 	stack build $(STACK_FLAGS) share-api:share-api

share-api/README.md

@@ -1,7 +1,7 @@
 module Main where
 
 import Share
-import Env (withEnv)
+import Share.Env (withEnv)
 
 main :: IO ()
 main = do

app/Main.hs share-api/app/Main.hsapp/Main.hs renamed to share-api/app/Main.hs

@@ -12,8 +12,6 @@ bug-reports:    https://github.com/unisoncomputing/share-api/issues
 author:         Unison Computing
 maintainer:     unison.cloud
 copyright:      2024 Unison Computing
-license:        MIT
-license-file:   LICENSE
 build-type:     Simple
 extra-source-files:
     README.md
@@ -51,6 +49,7 @@ library
       Share.Codebase.Types
       Share.Contribution
       Share.Env
+      Share.Env.Types
       Share.Github
       Share.IDs
       Share.Metrics
@@ -368,7 +367,6 @@ library
 executable share-api
   main-is: Main.hs
   other-modules:
-      Env
       Paths_share_api
   hs-source-dirs:
       app

package.yaml share-api/package.yamlpackage.yaml renamed to share-api/package.yaml

@@ -37,7 +37,7 @@ import Servant
 import Share.App
 import Share.BackgroundJobs qualified as BackgroundJobs
 import Share.BackgroundJobs.Monad (runBackground)
-import Share.Env qualified as Env
+import Share.Env.Types qualified as Env
 import Share.IDs (RequestId, UserId)
 import Share.IDs qualified as IDs
 import Share.JWT qualified as JWT

share-api.cabal share-api/share-api.cabalshare-api.cabal renamed to share-api/share-api.cabal

@@ -15,8 +15,8 @@ import Data.Map qualified as Map
 import Data.Set qualified as Set
 import Database.Redis qualified as R
 import OpenTelemetry.Trace.Monad (MonadTracer (..))
-import Share.Env (Env (..))
-import Share.Env qualified as Env
+import Share.Env.Types (Env (..))
+import Share.Env.Types qualified as Env
 import Share.JWT.Types (Audience (..), Issuer (..))
 import Share.Prelude
 import Share.Utils.Logging qualified as Logging

src/Share.hs share-api/src/Share.hssrc/Share.hs renamed to share-api/src/Share.hs

@@ -10,7 +10,7 @@ import Share.BackgroundJobs.Monad (Background)
 import Share.BackgroundJobs.Workers (newWorker)
 import Share.Codebase qualified as Codebase
 import Share.Codebase.CodebaseRuntime qualified as CR
-import Share.Env qualified as Env
+import Share.Env.Types qualified as Env
 import Share.IDs qualified as IDs
 import Share.Metrics qualified as Metrics
 import Share.Postgres qualified as PG