Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
63129e4
What horrors do we unearth when we try to gradle this build?
tonytw1 Nov 16, 2018
0959140
Starts up after gradle build; latest spring boot does not support vel…
tonytw1 Nov 16, 2018
c09de58
Spike; if we have to change the template engine, does freemarker work…
tonytw1 Nov 16, 2018
c3c8cf9
Template work in progress.
tonytw1 Nov 16, 2018
a66b7d8
Kotlin conversion.
tonytw1 Nov 16, 2018
96c2839
Fixes tests.
tonytw1 Nov 16, 2018
e17e993
Wiring cleverness
tonytw1 Nov 16, 2018
711588f
Kotlin conversion.
tonytw1 Nov 16, 2018
5ec76c0
url builder works if explictly added.
tonytw1 Nov 17, 2018
b1e8813
Correct option like mapping of a null =)
tonytw1 Nov 17, 2018
59b10a5
Yes this cleverness is allowed.
tonytw1 Nov 17, 2018
7f1769a
Urls and ifs.
tonytw1 Nov 17, 2018
39b17a7
Port my outings for template fixing.
tonytw1 Nov 17, 2018
e92f660
Templating.
tonytw1 Nov 17, 2018
d236f36
Ifs.
tonytw1 Nov 17, 2018
4632c51
List
tonytw1 Nov 17, 2018
b90cab6
Correct is empty asserts.
tonytw1 Nov 17, 2018
b085e35
Port.
tonytw1 Nov 17, 2018
592cbf6
Port.
tonytw1 Nov 17, 2018
ddbebd3
Setting up to port the whole reset password flow; simplest set of API…
tonytw1 Nov 17, 2018
ffa1f47
Convert templates.
tonytw1 Nov 17, 2018
2a09bde
Convert templates.
tonytw1 Nov 24, 2018
f8304cd
Reset password screen.
tonytw1 Nov 26, 2018
5d46fd2
How to user spring macro to get at the localisation values.
tonytw1 Nov 26, 2018
c4dae86
Place holder example.
tonytw1 Nov 26, 2018
6f8285f
Analytics.
tonytw1 Nov 26, 2018
9aa29cb
Data policy.
tonytw1 Nov 26, 2018
8b4d1ca
Text.
tonytw1 Nov 26, 2018
3f8d0d3
Text.
tonytw1 Nov 26, 2018
5fa90e6
URL.
tonytw1 Nov 26, 2018
afef749
Port cancel macro.
tonytw1 Nov 26, 2018
2249324
Ported nav macro.
tonytw1 Nov 26, 2018
2cd2d78
Fixes.
tonytw1 Nov 26, 2018
538d52c
Inline ? functions.
tonytw1 Nov 26, 2018
b405e82
Change password moves.
tonytw1 Nov 26, 2018
cab7b49
Deduplicate.
tonytw1 Nov 26, 2018
7124912
Move to Kotlin.
tonytw1 Nov 26, 2018
5a81bce
Clean ups.
tonytw1 Nov 26, 2018
674d20c
listOf.
tonytw1 Nov 26, 2018
6b5dae1
Migrate to Kotlin.
tonytw1 Nov 26, 2018
a89f686
Port contacts template.
tonytw1 Nov 27, 2018
c73f3b5
Port squad dropdown macro.
tonytw1 Nov 27, 2018
964f085
Clean up; no need to use named parameter on single argument methods.
tonytw1 Dec 3, 2018
9953cb2
Remove usused copy pf password gen jar.
tonytw1 Dec 3, 2018
b2de5fd
Move to Kotlin.
tonytw1 Dec 3, 2018
aeadf06
Move url builder to Kotlin; move interesting autowiring situation tha…
tonytw1 Dec 3, 2018
1b0c4c2
Formatting.
tonytw1 Dec 3, 2018
0526a41
Move to Kotlin.
tonytw1 Dec 3, 2018
a2e9710
Fix Spring wirings; still need Component annotations to be discovered.
tonytw1 Dec 3, 2018
8e22437
Migrated to Kotlin.
tonytw1 Dec 3, 2018
8fede7b
Migrate Guava orderings to Kotlin.
tonytw1 Dec 3, 2018
a776efe
Moves to Kotlin.
tonytw1 Dec 4, 2018
9a24ad4
Entry details work in progress.
tonytw1 Dec 4, 2018
f451ffc
Clean up; that's probably a map.
tonytw1 Dec 14, 2018
1d7c483
Map.
tonytw1 Dec 14, 2018
dcfb464
Clean up; use the logged in user's API client.
tonytw1 Dec 14, 2018
8407310
Throwing signed in user exception allows the exception handler to wor…
tonytw1 Dec 20, 2018
7d35997
Clean up; use a map.
tonytw1 Dec 29, 2018
c3d59d0
Move admin controller to Kotlin.
tonytw1 Dec 29, 2018
33b3080
Clean up; that's most likely a filter usage.
tonytw1 Dec 29, 2018
ea9437c
Clean up; mappings.
tonytw1 Dec 29, 2018
7f04388
Filter and inline.
tonytw1 Dec 29, 2018
2a33fe9
Move to Kotlin.
tonytw1 Dec 31, 2018
55258e3
Use logged in user's api.
tonytw1 Dec 31, 2018
cb8ebfc
Date formatting.
tonytw1 Dec 31, 2018
fcbecdd
Force use of logged in users api for entry details.
tonytw1 Dec 31, 2018
0ddf14f
Age fields work in progress.
tonytw1 Dec 31, 2018
f34b1e4
Points fields work in progress.
tonytw1 Dec 31, 2018
1cb44fa
Points.
tonytw1 Dec 31, 2018
460a879
Registration WIP.
tonytw1 Dec 31, 2018
72fba32
Freemarker null safe. Meh.
tonytw1 Dec 31, 2018
50d73f7
Governing body WIP.
tonytw1 Dec 31, 2018
455bc62
Entry details ajax WIP.
tonytw1 Dec 31, 2018
43843a6
Update year dependant tests.
tonytw1 Jan 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
buildscript {
ext.kotlin_version = '1.2.41'

repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE")
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#kotlin-spring-compiler-plugin

}
}

apply plugin: 'java'
apply plugin: "kotlin"
apply plugin: "kotlin-spring" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#kotlin-spring-compiler-plugin
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'

repositories {
mavenCentral()
mavenLocal()
}

sourceCompatibility = 1.8
targetCompatibility = 1.8

dependencies {
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-validation"
compile "org.springframework.boot:spring-boot-starter-freemarker"

compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.7"
compile "com.fasterxml.jackson.core:jackson-core:2.9.7"
compile "com.fasterxml.jackson.core:jackson-databind:2.9.7"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

compile "commons-fileupload:commons-fileupload:1.3.1"
compile "uk.co.squadlist:squadlist-api-client:0.0.1-SNAPSHOT"
compile "com.google.guava:guava:16.0"
compile "org.apache.commons:commons-csv:1.0"
compile "org.mnode.ical4j:ical4j:1.0.2"
compile "oro:oro:2.0.8"
compile "org.slf4j:slf4j-api:1.6.1"
compile "org.codehaus.jackson:jackson-core-asl:1.9.4"
compile "org.codehaus.jackson:jackson-mapper-asl:1.9.4"
compile "joda-time:joda-time:2.1"
compile "uk.co.eelpieconsulting.common:common-dates:1.0.10"
compile "jpwgen:jpwgen:1.2.0"
compile "commons-cli:commons-cli:1.2"
compile "com.restfb:restfb:1.46.0"
compile "commons-io:commons-io:2.4"
compile "org.apache.velocity:velocity:1.7"

compile "org.springframework:spring-aop"
compile "org.aspectj:aspectjweaver:1.7.0"

compile ('log4j:log4j:1.2.17')

testCompile("org.springframework.boot:spring-boot-starter-test")
testCompile("junit:junit:4.12")
testRuntime("org.junit.vintage:junit-vintage-engine:5.3.1")
testCompile 'org.mockito:mockito-core:1.10.8'

compile "org.springframework.boot:spring-boot-devtools"

}

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}

test {
useJUnitPlatform()
}
41 changes: 0 additions & 41 deletions build.xml

This file was deleted.

Binary file removed lib/repository/jpwgen/jpwgen/1.2.0/jpwgen-1.2.0.jar
Binary file not shown.
229 changes: 0 additions & 229 deletions pom.xml

This file was deleted.

36 changes: 0 additions & 36 deletions squadlist.yaml

This file was deleted.

Loading