Skip to content

Commit

Permalink
Try to fix build configuration
Browse files Browse the repository at this point in the history
Bump version to 1.0.0-rc1
  • Loading branch information
BierDav committed Apr 14, 2024
1 parent b10568e commit cb958e1
Show file tree
Hide file tree
Showing 20 changed files with 71 additions and 48 deletions.
10 changes: 2 additions & 8 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ plugins {
`kotlin-dsl`
}

repositories {
mavenCentral()
}

val kotlinVersion = "1.9.23"

dependencies {
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion")
implementation(libs.kotlin.gradle.plugin)
implementation(libs.kotlin.serialization)
}
11 changes: 11 additions & 0 deletions buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
from(files("../gradle/libs.versions.toml"))
}
}
repositories {
google()
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
group=at.quickme.kotlinmailer
version=0.3.0
version=1.0.0-rc1
21 changes: 21 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[versions]
simpleJavaMail = "8.8.2"
kotlinx-html = "0.11.0"
kotlinx-coroutines = "1.8.0"
kotlinx-serialization-json = "1.6.3"
kotlin = "1.9.23"

[libraries]
simpleJavaMail-batchModule = { group = "org.simplejavamail", name = "batch-module", version.ref = "simpleJavaMail" }
simpleJavaMail-simpleJavaMail = { group = "org.simplejavamail", name = "simple-java-mail", version.ref = "simpleJavaMail" }
simpleJavaMail-smimeModule = { group = "org.simplejavamail", name = "smime-module", version.ref = "simpleJavaMail" }
kotlinx-html = { group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version.ref = "kotlinx-html" }
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "kotlinx-coroutines" }
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
kotlin-serialization = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }


[plugins]
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion 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-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 0 additions & 18 deletions kotlinmailer-core/build.gradle.kts

This file was deleted.

10 changes: 0 additions & 10 deletions kotlinmailer-html/build.gradle.kts

This file was deleted.

16 changes: 16 additions & 0 deletions packages/core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
plugins {
id("common-build-script")
id("maven-publish-script")
id(libs.plugins.kotlin.serialization.get().pluginId) apply false
}

dependencies {
implementation(libs.kotlinx.serialization.json)

implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.coroutines.jdk8)

implementation(libs.simpleJavaMail.batchModule)
implementation(libs.simpleJavaMail.simpleJavaMail)
implementation(libs.simpleJavaMail.smimeModule)
}
11 changes: 11 additions & 0 deletions packages/html/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
plugins {
id("common-build-script")
id("maven-publish-script")
}

dependencies {
project(":packages:core")

implementation(libs.kotlinx.html)
implementation(libs.simpleJavaMail.simpleJavaMail)
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ plugins {
}

dependencies {
implementation(project(":${rootProject.name}-core"))
implementation(project(":${rootProject.name}-html"))
project(":packages:core")
project(":packages:html")

testImplementation("org.slf4j:slf4j-simple:2.0.7")
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ repositories {
}
dependencies {
implementation "at.quickme.kotlinmailer:kotlinmailer-core:1.0.0"
implementation "at.quickme.kotlinmailer:core:1.0.0"
// Optional for Kotlinx HTML DSL support
implementation "at.quickme.kotlinmailer:kotlinmailer-html:1.0.0"
implementation "at.quickme.kotlinmailer:html:1.0.0"
}
```

Expand Down
10 changes: 4 additions & 6 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
val projectName = "kotlinmailer"
rootProject.name = "kotlinmailer"

rootProject.name = projectName

include("$projectName-core")
include("$projectName-html")
include("$projectName-test")
include("packages:core")
include("packages:html")
include("packages:test")

0 comments on commit cb958e1

Please sign in to comment.