Skip to content

Commit

Permalink
I finally figured out how to get dependency management working in mul…
Browse files Browse the repository at this point in the history
…ti-module
  • Loading branch information
NovaFox161 committed Sep 29, 2023
1 parent 7dbd381 commit 917e13e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 41 deletions.
40 changes: 15 additions & 25 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {

// Spring
kotlin("plugin.spring")
id("org.springframework.boot") apply false
id("org.springframework.boot")
id("io.spring.dependency-management")

//Tooling
Expand All @@ -36,32 +36,22 @@ allprojects {
apply(plugin = "io.spring.dependency-management")

// Versions --- found in gradle.properties
val kotlinVersion: String by properties
// Tool
val kotlinxCoroutinesReactorVersion: String by properties
val reactorKotlinExtensions: String by properties
// Discord
val discord4jVersion: String by properties
val discord4jStoresVersion: String by properties
val discordWebhookVersion: String by properties
// Spring
val springVersion: String by properties
// Database
val flywayVersion: String by properties
// Database\
val mikuR2dbcMySqlVersion: String by properties
val mySqlConnectorJava: String by properties
// Serialization
val kotlinxSerializationJsonVersion: String by properties
val jacksonVersion: String by properties
val jsonVersion: String by properties
// Observability
val logbackContribVersion: String by properties
// Google libs
val googleApiClientVersion: String by properties
val googleServicesCalendarVersion: String by properties
val googleOauthClientVersion: String by properties
// Various libs
val okhttpVersion: String by properties
val copyDownVersion: String by properties
val jsoupVersion: String by properties

Expand All @@ -78,32 +68,32 @@ allprojects {

dependencies {
// Tools
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesReactorVersion")
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions:$reactorKotlinExtensions")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")

// Discord
implementation("com.discord4j:discord4j-core:$discord4jVersion")
implementation("com.discord4j:stores-redis:$discord4jStoresVersion")
implementation("club.minnced:discord-webhooks:$discordWebhookVersion")

// Spring
implementation("org.springframework.boot:spring-boot-starter-data-jdbc:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-data-r2dbc:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-data-redis:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-webflux:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-cache:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
implementation("org.springframework.boot:spring-boot-starter-data-redis")
implementation("org.springframework.boot:spring-boot-starter-webflux")
implementation("org.springframework.boot:spring-boot-starter-cache")

// Database
implementation("dev.miku:r2dbc-mysql:$mikuR2dbcMySqlVersion")
implementation("mysql:mysql-connector-java:$mySqlConnectorJava")

// Serialization
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationJsonVersion")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
implementation("org.json:json:$jsonVersion")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
implementation("org.json:json")

// Observability
implementation("ch.qos.logback.contrib:logback-json-classic:$logbackContribVersion")
Expand All @@ -117,7 +107,7 @@ allprojects {
}

// Various Libs
implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
implementation("com.squareup.okhttp3:okhttp")
implementation("io.github.furstenheim:copy_down:$copyDownVersion")
implementation("org.jsoup:jsoup:$jsoupVersion")
}
Expand Down
1 change: 1 addition & 0 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ plugins {

// Spring
kotlin("plugin.spring")
id("org.springframework.boot")
id("io.spring.dependency-management")

// Tooling
Expand Down
9 changes: 0 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# TODO: I eventually want to get spring's dependency management (BOM) plugin working one day, but its not resolving versions somehow?

# Language
kotlinVersion=1.9.10

Expand All @@ -11,10 +9,6 @@ gitPropertiesVersion=2.4.1
# Buildscript tooling
kotlinPoetVersion=1.14.2

# Tools
kotlinxCoroutinesReactorVersion=1.7.3
reactorKotlinExtensions=1.2.2

# Discord
discord4jVersion=3.2.6
discord4jStoresVersion=3.2.2
Expand All @@ -24,14 +18,11 @@ discordWebhookVersion=0.8.4
springVersion=3.1.3

# Database
flywayVersion=9.3.0
mikuR2dbcMySqlVersion=0.8.2.RELEASE
mySqlConnectorJava=8.0.33

# Serialization
kotlinxSerializationJsonVersion=1.6.0
jacksonVersion=2.15.2
jsonVersion=20230618

# Observability
logbackContribVersion=0.1.5
Expand Down
8 changes: 2 additions & 6 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ plugins {
id("com.google.cloud.tools.jib")
}

// Versions --- found in gradle.properties
// Database
val flywayVersion: String by properties

dependencies {
api(project(":core"))

// Database
implementation("org.flywaydb:flyway-core:$flywayVersion")
implementation("org.flywaydb:flyway-mysql:$flywayVersion")
implementation("org.flywaydb:flyway-core")
implementation("org.flywaydb:flyway-mysql")
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {
// Spring
kotlin("plugin.spring") version kotlinVersion
id("io.spring.dependency-management") version springDependencyManagementVersion
id("org.springframework.boot") version springVersion apply false
id("org.springframework.boot") version springVersion

// Tooling
id("com.gorylenko.gradle-git-properties") version gitPropertiesVersion apply false
Expand Down

0 comments on commit 917e13e

Please sign in to comment.