From c38cdb2621fad5cc3278cbc8d879b66333fb012d Mon Sep 17 00:00:00 2001
From: William Brawner <me@wbrawner.com>
Date: Wed, 28 Jul 2021 18:49:48 -0600
Subject: [PATCH] Rename api module to app

---
 {api => app}/.gitignore                                      | 0
 {api => app}/build.gradle.kts                                | 2 +-
 .../src/main/kotlin/com/wbrawner/twigs/server/Application.kt | 0
 .../main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt   | 0
 .../com/wbrawner/twigs/server/TwigsServerApplication.kt      | 0
 .../src/main/kotlin/com/wbrawner/twigs/server/Utils.kt       | 0
 .../main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt   | 0
 .../com/wbrawner/twigs/server/budget/BudgetController.kt     | 0
 .../com/wbrawner/twigs/server/budget/BudgetRepository.kt     | 0
 .../kotlin/com/wbrawner/twigs/server/category/Category.kt    | 0
 .../com/wbrawner/twigs/server/category/CategoryController.kt | 0
 .../com/wbrawner/twigs/server/category/CategoryRepository.kt | 0
 .../wbrawner/twigs/server/config/JdbcUserDetailsService.kt   | 0
 .../com/wbrawner/twigs/server/config/MethodSecurity.kt       | 0
 .../com/wbrawner/twigs/server/config/SecurityConfig.kt       | 0
 .../twigs/server/config/SessionAuthenticationToken.kt        | 0
 .../twigs/server/config/SilentAuthenticationEntryPoint.kt    | 0
 .../twigs/server/config/TokenAuthenticationFilter.kt         | 0
 .../twigs/server/config/TokenAuthenticationProvider.kt       | 0
 .../server/passwordresetrequest/PasswordResetRequest.kt      | 0
 .../passwordresetrequest/PasswordResetRequestRepository.kt   | 0
 .../com/wbrawner/twigs/server/permission/Permission.kt       | 0
 .../twigs/server/permission/UserPermissionRepository.kt      | 0
 .../main/kotlin/com/wbrawner/twigs/server/session/Session.kt | 0
 .../com/wbrawner/twigs/server/session/SessionCleanupTask.kt  | 0
 .../wbrawner/twigs/server/session/UserSessionRepository.kt   | 0
 .../com/wbrawner/twigs/server/transaction/Transaction.kt     | 0
 .../twigs/server/transaction/TransactionController.kt        | 0
 .../twigs/server/transaction/TransactionRepository.kt        | 0
 .../src/main/kotlin/com/wbrawner/twigs/server/user/User.kt   | 0
 .../kotlin/com/wbrawner/twigs/server/user/UserController.kt  | 0
 .../kotlin/com/wbrawner/twigs/server/user/UserRepository.kt  | 0
 {api => app}/src/main/resources/application.conf             | 0
 {api => app}/src/main/resources/application.properties       | 0
 build.gradle.kts                                             | 5 +++--
 35 files changed, 4 insertions(+), 3 deletions(-)
 rename {api => app}/.gitignore (100%)
 rename {api => app}/build.gradle.kts (97%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/Application.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/TwigsServerApplication.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/Utils.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetController.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/category/Category.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryController.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/JdbcUserDetailsService.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/MethodSecurity.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/SecurityConfig.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/SessionAuthenticationToken.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/SilentAuthenticationEntryPoint.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationFilter.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationProvider.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequest.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequestRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/permission/Permission.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/permission/UserPermissionRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/session/Session.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/session/SessionCleanupTask.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/session/UserSessionRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/transaction/Transaction.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionController.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionRepository.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/user/User.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/user/UserController.kt (100%)
 rename {api => app}/src/main/kotlin/com/wbrawner/twigs/server/user/UserRepository.kt (100%)
 rename {api => app}/src/main/resources/application.conf (100%)
 rename {api => app}/src/main/resources/application.properties (100%)

diff --git a/api/.gitignore b/app/.gitignore
similarity index 100%
rename from api/.gitignore
rename to app/.gitignore
diff --git a/api/build.gradle.kts b/app/build.gradle.kts
similarity index 97%
rename from api/build.gradle.kts
rename to app/build.gradle.kts
index 067050d..d66c510 100644
--- a/api/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
 }
 
 val kotlinVersion: String by rootProject.extra
-val ktorVersion = "1.6.1"
+val ktorVersion: String by rootProject.extra
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/Application.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/Application.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/Application.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/Application.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/ErrorResponse.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/TwigsServerApplication.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/TwigsServerApplication.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/TwigsServerApplication.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/TwigsServerApplication.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/Utils.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/Utils.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/Utils.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/Utils.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/budget/Budget.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetController.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetController.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetController.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetController.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/budget/BudgetRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/category/Category.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/category/Category.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/category/Category.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/category/Category.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryController.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryController.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryController.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryController.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/category/CategoryRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/JdbcUserDetailsService.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/JdbcUserDetailsService.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/JdbcUserDetailsService.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/JdbcUserDetailsService.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/MethodSecurity.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/MethodSecurity.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/MethodSecurity.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/MethodSecurity.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/SecurityConfig.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/SecurityConfig.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/SecurityConfig.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/SecurityConfig.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/SessionAuthenticationToken.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/SessionAuthenticationToken.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/SessionAuthenticationToken.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/SessionAuthenticationToken.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/SilentAuthenticationEntryPoint.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/SilentAuthenticationEntryPoint.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/SilentAuthenticationEntryPoint.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/SilentAuthenticationEntryPoint.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationFilter.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationFilter.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationFilter.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationFilter.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationProvider.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationProvider.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationProvider.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/config/TokenAuthenticationProvider.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequest.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequest.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequest.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequest.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequestRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequestRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequestRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/passwordresetrequest/PasswordResetRequestRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/permission/Permission.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/permission/Permission.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/permission/Permission.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/permission/Permission.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/permission/UserPermissionRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/permission/UserPermissionRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/permission/UserPermissionRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/permission/UserPermissionRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/session/Session.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/session/Session.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/session/Session.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/session/Session.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/session/SessionCleanupTask.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/session/SessionCleanupTask.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/session/SessionCleanupTask.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/session/SessionCleanupTask.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/session/UserSessionRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/session/UserSessionRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/session/UserSessionRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/session/UserSessionRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/transaction/Transaction.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/transaction/Transaction.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/transaction/Transaction.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/transaction/Transaction.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionController.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionController.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionController.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionController.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/transaction/TransactionRepository.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/user/User.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/user/User.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/user/User.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/user/User.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/user/UserController.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/user/UserController.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/user/UserController.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/user/UserController.kt
diff --git a/api/src/main/kotlin/com/wbrawner/twigs/server/user/UserRepository.kt b/app/src/main/kotlin/com/wbrawner/twigs/server/user/UserRepository.kt
similarity index 100%
rename from api/src/main/kotlin/com/wbrawner/twigs/server/user/UserRepository.kt
rename to app/src/main/kotlin/com/wbrawner/twigs/server/user/UserRepository.kt
diff --git a/api/src/main/resources/application.conf b/app/src/main/resources/application.conf
similarity index 100%
rename from api/src/main/resources/application.conf
rename to app/src/main/resources/application.conf
diff --git a/api/src/main/resources/application.properties b/app/src/main/resources/application.properties
similarity index 100%
rename from api/src/main/resources/application.properties
rename to app/src/main/resources/application.properties
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a8db00..4d3ff33 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,9 @@
-import java.net.URI
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.net.URI
 
 buildscript {
     val kotlinVersion: String by extra("1.5.20")
+    val ktorVersion: String by extra("1.6.1")
     repositories {
         mavenLocal()
         mavenCentral()
@@ -18,7 +19,7 @@ buildscript {
 
 plugins {
     java
-    kotlin("jvm") version "1.5.10"
+    kotlin("jvm") version "1.5.20"
 }
 
 allprojects {