Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-build
Browse files Browse the repository at this point in the history
  • Loading branch information
kaklakariada authored May 11, 2024
2 parents 479576c + efaf888 commit afb9120
Show file tree
Hide file tree
Showing 24 changed files with 19,876 additions and 58,704 deletions.
5 changes: 3 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true
}
}
},
"java.configuration.updateBuildConfiguration": "automatic"
}
6 changes: 3 additions & 3 deletions backend/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.problem.APILeak=warning
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
Expand Down Expand Up @@ -106,7 +106,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=enabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
Expand Down
40 changes: 20 additions & 20 deletions backend/build.gradle
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
plugins {
id 'java'
id 'jacoco'
id "com.diffplug.eclipse.apt" version "3.40.0"
id "com.github.ben-manes.versions" version "0.45.0"
id "org.sonarqube" version "4.0.0.2929"
id "com.diffplug.eclipse.apt" version "3.44.0"
id "com.github.ben-manes.versions" version "0.51.0"
id "org.sonarqube" version "5.0.0.4638"
}

repositories {
mavenCentral()
}

sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 21
targetCompatibility = 21
compileJava.options.compilerArgs += '-parameters'
compileTestJava.options.compilerArgs += '-parameters'

version = '0.0.1'

ext {
micronautVersion = '3.8.5'
micronautAwsVersion = '3.13.1'
awsSdkVersion = '1.12.410'
micronautVersion = '4.4.2'
micronautAwsVersion = '4.5.0'
awsSdkVersion = '1.12.718'
}

dependencies {
annotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
annotationProcessor "io.micronaut:micronaut-inject-java"
annotationProcessor "io.micronaut:micronaut-validation"
annotationProcessor "io.micronaut:micronaut-validation:3.10.4"

implementation platform("io.micronaut:micronaut-bom:$micronautVersion")
implementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
implementation "io.micronaut:micronaut-inject"
implementation "io.micronaut:micronaut-validation"
implementation "io.micronaut:micronaut-validation:3.10.4"
implementation "io.micronaut:micronaut-runtime"
implementation "io.micronaut:micronaut-http-server-netty"
implementation "io.micronaut:micronaut-http-client"
implementation "io.micronaut.crac:micronaut-crac"
implementation "io.micronaut:micronaut-jackson-databind"

implementation "io.micronaut.aws:micronaut-function-aws-api-proxy:$micronautAwsVersion"
implementation "io.micronaut.aws:micronaut-function-aws"
implementation "com.amazonaws:aws-java-sdk-ec2:$awsSdkVersion"
implementation "com.amazonaws:aws-java-sdk-dynamodb:$awsSdkVersion"
implementation "com.amazonaws:aws-java-sdk-route53:$awsSdkVersion"
implementation "com.amazonaws:aws-java-sdk-pricing:$awsSdkVersion"

implementation 'ch.qos.logback:logback-classic:1.4.5'
implementation 'ch.qos.logback:logback-classic:1.5.6'
implementation 'io.symphonia:lambda-logging:1.0.3:no-config'

testAnnotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
testAnnotationProcessor "io.micronaut:micronaut-inject-java"

testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion")
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
testImplementation "io.micronaut.test:micronaut-test-junit5:3.1.1"
testImplementation "org.mockito:mockito-core:5.1.1"
testRuntimeOnly "com.fasterxml.jackson.module:jackson-module-afterburner:2.14.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
testImplementation "io.micronaut.test:micronaut-test-junit5:4.3.0"
testImplementation "org.mockito:mockito-core:5.11.0"
testRuntimeOnly "com.fasterxml.jackson.module:jackson-module-afterburner:2.17.1"
}

test {
Expand Down
2 changes: 1 addition & 1 deletion backend/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

This file was deleted.

3 changes: 2 additions & 1 deletion backend/src/main/resources/application-lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ micronaut:
enabled: true
configurations:
all-prod:
allowed-origins: https://ec2.chp1.net
allowedMethods:
- GET
- POST
- PUT
allowedHeaders:
- Authorization
allowCredentials: true
maxAge: 1800 # 30 min
maxAge: 1800 # 30 min

This file was deleted.

13 changes: 0 additions & 13 deletions frontend/.eslintrc.js

This file was deleted.

12 changes: 12 additions & 0 deletions frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";


export default [
{languageOptions: { globals: globals.browser }},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
pluginReactConfig,
];
Loading

0 comments on commit afb9120

Please sign in to comment.