Skip to content

Commit

Permalink
Push works
Browse files Browse the repository at this point in the history
  • Loading branch information
cheroliv committed Oct 7, 2024
1 parent bf1a79c commit bcf51d2
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 28 deletions.
3 changes: 0 additions & 3 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"UnstableApiUsage",
)

import org.gradle.api.JavaVersion.VERSION_21
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
Expand Down Expand Up @@ -33,8 +32,6 @@ plugins {
id("io.spring.dependency-management")
}



group = properties["artifact.group"].toString()
version = properties["artifact.version"].toString()

Expand Down
4 changes: 2 additions & 2 deletions api/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spring:
problemdetails:
enabled: true
web:
locale: en
locale: fr_FR
##############################################################################

logging:
Expand All @@ -73,5 +73,5 @@ logging:
##############################################################################

server:
port: 8080
port: 8880
##############################################################################
31 changes: 16 additions & 15 deletions base/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,21 @@ plugins {
`java-library`
}

version = ("artifact.version" to "artifact.version.key").artifactVersion

val Pair<String, String>.artifactVersion: String
get() = first.run(
Properties().apply {
second.run(properties::get).let {
"user.home"
.run(System::getProperty)
.run { "$this$it" }
}.run(::File)
.inputStream()
.use(::load)
}::get
).toString()

repositories { mavenCentral() }

dependencies {
Expand All @@ -20,18 +35,4 @@ dependencies {
implementation(libs.guava)
}

version = "artifact.version".run(
Properties().apply {
"artifact.version.key"
.run(properties::get)
.let {
"user.home"
.run(System::getProperty)
.run { "$this$it" }
}.run(::File)
.inputStream()
.use(::load)
}::get
).toString()

tasks.named<Test>("test") { useJUnitPlatform() }
tasks.named<Test>("test") { useJUnitPlatform() }
40 changes: 40 additions & 0 deletions base/src/main/kotlin/base/User.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package base

//import com.fasterxml.jackson.annotation.JsonIgnore
//import jakarta.validation.constraints.NotNull
//import jakarta.validation.constraints.Pattern
//import jakarta.validation.constraints.Size
//import webapp.core.model.EntityModel
//import webapp.core.property.ANONYMOUS_USER
//import webapp.core.property.EMPTY_STRING
//import webapp.users.UserDao.Constraints.LOGIN_REGEX
//import webapp.users.security.Role
//import java.util.*
//import jakarta.validation.constraints.Email as EmailConstraint

data class User(
// override val id: UUID? = null,

// @field:NotNull
// @field:Pattern(regexp = LOGIN_REGEX)
// @field:Size(min = 1, max = 50)
val login: String,

// @JsonIgnore
// @field:NotNull
// @field:Size(min = 60, max = 60)
// val password: String = EMPTY_STRING,

// @field:EmailConstraint
// @field:Size(min = 5, max = 254)
// val email: String = EMPTY_STRING,

// @JsonIgnore
// val roles: MutableSet<Role> = mutableSetOf(Role(ANONYMOUS_USER)),

// @field:Size(min = 2, max = 10)
// val langKey: String = EMPTY_STRING,

// @JsonIgnore
val version: Long = -1,
) //: EntityModel<UUID>()
12 changes: 4 additions & 8 deletions base/src/main/kotlin/org/example/Library.kt
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package org.example

class Library {
fun someLibraryMethod(): Boolean {
return true
}
fun someLibraryMethod(): Boolean = true

companion object {
@JvmStatic
fun main(args: Array<String>): Unit {
Library()
.run(Library::someLibraryMethod)
.let(::println)
}
fun main(args: Array<String>) = Library()
.run(Library::someLibraryMethod)
.let(::println)
}
}

0 comments on commit bcf51d2

Please sign in to comment.