Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjusts for Kotlin v2 #466

Merged
merged 3 commits into from
Jan 29, 2025
+5 −4
Merged

adjusts for Kotlin v2 #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35c8244
update kotlin to v2
mshima Jan 28, 2025
1266b4a
set ktlint in gradle plugin
mshima Jan 28, 2025
c1ab277
Update libs.versions.toml
mshima Jan 28, 2025
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
1 change: 1 addition & 0 deletions generators/ktlint/templates/gradle/ktlint.gradle.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
-%>
ktlint {
//See more options: https://github.com/JLLeitschuh/ktlint-gradle#configuration
version = "<%- javaDependencies['ktlint-cli'] %>"
ignoreFailures = true
filter {
include("src/main/kotlin/**")
Expand Down
4 changes: 2 additions & 2 deletions ...pring-boot/templates/src/test/kotlin/_package_/security/DomainUserDetailsServiceIT.kt.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class DomainUserDetailsServiceIT {

@Test
fun assertThatUserCanBeFoundByLoginIgnoreCase() {
val userDetails = domainUserDetailsService.<% if (reactive) { %>find<% } else { %>loadUser<% } %>ByUsername(USER_ONE_LOGIN.toUpperCase(Locale.ENGLISH))<% if (reactive) { %>.block()<% } %>
val userDetails = domainUserDetailsService.<% if (reactive) { %>find<% } else { %>loadUser<% } %>ByUsername(USER_ONE_LOGIN.uppercase(Locale.ENGLISH))<% if (reactive) { %>.block()<% } %>
assertThat(userDetails).isNotNull
assertThat(userDetails.username).isEqualTo(USER_ONE_LOGIN)
}
Expand All @@ -161,7 +161,7 @@ class DomainUserDetailsServiceIT {

@Test
fun assertThatUserCanBeFoundByEmailIgnoreCase() {
val userDetails = domainUserDetailsService.<% if (reactive) { %>find<% } else { %>loadUser<% } %>ByUsername(USER_TWO_EMAIL.toUpperCase(Locale.ENGLISH))<% if (reactive) { %>.block()<% } %>
val userDetails = domainUserDetailsService.<% if (reactive) { %>find<% } else { %>loadUser<% } %>ByUsername(USER_TWO_EMAIL.uppercase(Locale.ENGLISH))<% if (reactive) { %>.block()<% } %>
assertThat(userDetails).isNotNull
assertThat(userDetails.username).isEqualTo(USER_TWO_LOGIN)
}
Expand Down
4 changes: 2 additions & 2 deletions generators/spring-boot/templates/src/test/kotlin/_package_/service/MailServiceIT.kt.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ class MailServiceIT {
var javaLangKey = langKey
val matcher2 = PATTERN_LOCALE_2.matcher(langKey)
if (matcher2.matches()) {
javaLangKey = "${matcher2.group(1)}_${matcher2.group(2).toUpperCase()}"
javaLangKey = "${matcher2.group(1)}_${matcher2.group(2).uppercase()}"
}
val matcher3 = PATTERN_LOCALE_3.matcher(langKey)
if (matcher3.matches()) {
javaLangKey = "${matcher3.group(1)}_${matcher3.group(2)}_${matcher3.group(3).toUpperCase()}"
javaLangKey = "${matcher3.group(1)}_${matcher3.group(2)}_${matcher3.group(3).uppercase()}"
}
return javaLangKey
}
Expand Down
Loading