From a4c257515aa5445806b8e88d9573205eb84669dc Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Oct 2024 15:59:21 +0800 Subject: [PATCH 01/20] Add CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..36b427c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Change log + +## v0.2.0 / 2024-6-19 + +* bump Exposed to 0.53.0 +* add some more detailed exception messages +* add a `KFunction.callWithCatch` function and use it on calling constructors for easier debugging +* add a `selectWithMapper` table DSL From 9db74cc20a111cee6659e0d3aeb4b7f56a554be7 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Oct 2024 16:13:46 +0800 Subject: [PATCH 02/20] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36b427c..fc78c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,4 +5,5 @@ * bump Exposed to 0.53.0 * add some more detailed exception messages * add a `KFunction.callWithCatch` function and use it on calling constructors for easier debugging +* add a basic usage guide * add a `selectWithMapper` table DSL From 244d12fa239c6b6419d63b2a2bc5b2e00f6976d6 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sun, 20 Oct 2024 16:16:32 +0800 Subject: [PATCH 03/20] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc78c3e..1a2a577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## v0.2.0 / 2024-6-19 +## v0.2.0 / 2024-10-19 * bump Exposed to 0.53.0 * add some more detailed exception messages From c90a5a0a41e97aeb83128ecb51eeb4b63fa3f58d Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Mon, 4 Nov 2024 12:20:25 +0800 Subject: [PATCH 04/20] Create kotlin-jvm-ci.yml with our workflow template --- .github/workflows/kotlin-jvm-ci.yml | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/kotlin-jvm-ci.yml diff --git a/.github/workflows/kotlin-jvm-ci.yml b/.github/workflows/kotlin-jvm-ci.yml new file mode 100644 index 0000000..f3135e8 --- /dev/null +++ b/.github/workflows/kotlin-jvm-ci.yml @@ -0,0 +1,45 @@ +name: CI + +on: + push: + branches: [ "*" ] +# pull_request: +# branches: [ "*" ] + +jobs: + check: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Check with Gradle Wrapper + run: ./gradlew check + + dependency-submission: + + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@v4 From 4bf7115c6a82bed3d350d164d230685dec0b4c12 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Tue, 5 Nov 2024 18:57:27 +0800 Subject: [PATCH 05/20] Configure the Dokka Gradle plugin, its tasks, and the GitHub Actions workflow, with code copied and adapted from "kotlin-common" A source commit: https://github.com/huanshankeji/gradle-common/commit/d0c81059c453e854043475d9e7f077826ad84c8a The `dokkaGenerate` task fails with an error, which may be due to a bug from Dokka. This is similar to the problem in "gradle-common" so see https://github.com/huanshankeji/gradle-common/commit/d0c81059c453e854043475d9e7f077826ad84c8a for more details on this. --- .github/workflows/dokka-gh-pages.yml | 61 ++++++++++++++++++++++++++++ build.gradle.kts | 8 ++++ buildSrc/build.gradle.kts | 1 + gradle.properties | 2 + lib/build.gradle.kts | 10 +++++ 5 files changed, 82 insertions(+) create mode 100644 .github/workflows/dokka-gh-pages.yml create mode 100644 gradle.properties diff --git a/.github/workflows/dokka-gh-pages.yml b/.github/workflows/dokka-gh-pages.yml new file mode 100644 index 0000000..2781a64 --- /dev/null +++ b/.github/workflows/dokka-gh-pages.yml @@ -0,0 +1,61 @@ +name: Deploy the API documentation to GitHub Pages with Dokka + +on: + push: + branches: [ "release" ] + pull_request: + branches: [ "release" ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Build job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: "8" + distribution: "temurin" + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build the distribution with Gradle Wrapper + run: ./gradlew :dokkaGeneratePublicationHtml + + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + path: build/dokka/html/ + + # Deployment job + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/build.gradle.kts b/build.gradle.kts index 1241019..c5588d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,11 @@ tasks.wrapper { distributionType = Wrapper.DistributionType.ALL } + +plugins { + id("org.jetbrains.dokka") +} + +dependencies { + dokka(project(":exposed-adt-mapping")) +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bf8774c..6a6f9e2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -19,4 +19,5 @@ dependencies { implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch + implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4a50b9e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +# for Dokka +org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index a4f2481..54f9243 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -1,5 +1,6 @@ plugins { conventions + id("org.jetbrains.dokka") } dependencies { @@ -8,3 +9,12 @@ dependencies { implementation(commonDependencies.kotlinCommon.reflect()) implementation(commonDependencies.kotlinCommon.core()) } + +dokka { + dokkaSourceSets.all { + sourceLink { + remoteUrl("https://github.com/huanshankeji/exposed-adt-mapping/tree/v${version}/lib") + remoteLineSuffix.set("#L") + } + } +} From 65548c38a72f037345ad0aff4982522348753fdf Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Tue, 5 Nov 2024 19:17:17 +0800 Subject: [PATCH 06/20] Workaround the issue in the previous commit A source commit: https://github.com/huanshankeji/gradle-common/commit/c8f99f38057f2634be176d7b96d5934624400e30#diff-c0dfa6bc7a8685217f70a860145fbdf416d449eaff052fa28352c5cec1a98c06R12 --- build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index c5588d5..3a414db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,11 @@ plugins { id("org.jetbrains.dokka") } +// workaround for https://github.com/Kotlin/dokka/issues/3903 from https://github.com/Kotlin/dokka/issues/2260 TODO remove when it's fixed +repositories { + mavenCentral() +} + dependencies { dokka(project(":exposed-adt-mapping")) } From c99918ae993a83fdfdcc61fb7becd6e7b6275ad5 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Tue, 5 Nov 2024 20:40:15 +0800 Subject: [PATCH 07/20] Update README.md about the API documentation --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e0bb35c..1b11f00 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ This project is an attempt to provide an alternative to [Exposed DAO](https://gi Please note that these APIs are far from stable. There are going to be refactors in future releases. +[Check out the API documentation here.](https://huanshankeji.github.io/exposed-adt-mapping/.) + ### Table and data definitions #### Tables and joins From e26e6c12b2e2870d0da770b8eee2bc2abb2e7680 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Wed, 6 Nov 2024 09:56:07 +0800 Subject: [PATCH 08/20] Resolve the Dokka "could not resolve" issue with the official solution A source commit: https://github.com/huanshankeji/gradle-common/commit/c1c69c36fc82be8876c516a3dc06570f1271d857 --- build.gradle.kts | 5 ----- settings.gradle.kts | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3a414db..c5588d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,11 +6,6 @@ plugins { id("org.jetbrains.dokka") } -// workaround for https://github.com/Kotlin/dokka/issues/3903 from https://github.com/Kotlin/dokka/issues/2260 TODO remove when it's fixed -repositories { - mavenCentral() -} - dependencies { dokka(project(":exposed-adt-mapping")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 08558d5..1cd2e11 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,3 +6,10 @@ plugins { rootProject.name = "exposed-adt-mapping" include("lib") project(":lib").name = rootProject.name + +@Suppress("UnstableApiUsage") +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} From 18800b706e5d5bacd23ca9e20d8389bbef7d2a02 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Wed, 6 Nov 2024 10:06:36 +0800 Subject: [PATCH 09/20] Add a comment --- settings.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1cd2e11..e1b029c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,6 +7,7 @@ rootProject.name = "exposed-adt-mapping" include("lib") project(":lib").name = rootProject.name +// for Dokka @Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { From 6e09828644e2db73da1d10c67a35e2185a0503d6 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 7 Nov 2024 17:02:35 +0800 Subject: [PATCH 10/20] Use the new `com.huanshankeji.team.dokka.github-dokka-convention` plugin Running `dokkaGenerate` yields this message: ```text > Failed to apply plugin 'com.huanshankeji.dokka.dokka-convention'. > Cannot query the value of extension 'dokkaConvention' property 'sourceLinkRemoteUrlRoot' because it has no value available. ``` It's strange because applying the plugin works without errors in https://github.com/huanshankeji/kotlin-common/commit/13845280240117e5095196b482ccbb5e8c0137bf. --- buildSrc/build.gradle.kts | 2 +- lib/build.gradle.kts | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6a6f9e2..507988e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 54f9243..354f568 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -1,6 +1,6 @@ plugins { conventions - id("org.jetbrains.dokka") + id("com.huanshankeji.team.dokka.github-dokka-convention") } dependencies { @@ -9,12 +9,3 @@ dependencies { implementation(commonDependencies.kotlinCommon.reflect()) implementation(commonDependencies.kotlinCommon.core()) } - -dokka { - dokkaSourceSets.all { - sourceLink { - remoteUrl("https://github.com/huanshankeji/exposed-adt-mapping/tree/v${version}/lib") - remoteLineSuffix.set("#L") - } - } -} From 2ccd8cff7ebce6a0f49bd3f7348e791c12ac217d Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 7 Nov 2024 17:59:54 +0800 Subject: [PATCH 11/20] Debug the changes in the `com.huanshankeji.team.dokka.github-dokka-convention` plugin and resolve the error in the previous commit The corresponding commit: https://github.com/huanshankeji/gradle-common/commit/fac56e49fb61077287a041596ab21e2f8d2c98d7 From cb52a4f039bdce90fe203401ffc46711bce03a93 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 7 Nov 2024 22:34:43 +0800 Subject: [PATCH 12/20] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..da80987 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +shreckye@gmail.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. From f395d88e67af383f858406580f73b36c074e3d42 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 8 Nov 2024 00:11:57 +0800 Subject: [PATCH 13/20] Create CONTRIBUTING.md A source commit: https://github.com/huanshankeji/gradle-common/commit/c0118b9ef0c90c75d6426bacde3b2069bc0668a6 --- CONTRIBUTING.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..ca714df --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,23 @@ +# Contributing guidelines + +Hello, thank you for your interest in contributing to our project. + +## Issues and Discussions + +You are welcome to submit issues on bugs or feature requests. If you have questions, please ask them in GitHub Discussions. + +## Pull requests + +If you want to contribute to the code of our project, you are welcome to open pull requests. However, it's always a good idea to open a related issue or talk with us in Discussions first. + +## Development + +Please make sure you have a valid JDK installed. Some projects may require multiple JDKs of different versions. The JDK version we use can be found in the [GitHub Actions workflow files](.github/workflows). + +We recommend developing with IntelliJ IDEA. In IntelliJ IDEA, select the correct [Project SDK in Project Structure](https://www.jetbrains.com/help/idea/project-settings-and-structure.html#project-sdk) and it's recommended to set [Gradle JVM](https://www.jetbrains.com/help/idea/gradle-jvm-selection.html#jvm_settings) to "Project SDK". + +Run the `publishToMavenLocal` Gradle task to publish the libraries to your machine's Maven Local Repository so your projects can depend on the changes you have made, run `check` to ensure our limited number of tests pass. + +## Furthur notice + +We are currently a small team with limited effort. While we may not always implement your requested features, merge your pull requests, or do such things in time, you are always welcome to create your own fork and make any changes you like. From 0b54e648f6c50be5977b7b9793e35656e3a2280b Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 8 Nov 2024 10:55:27 +0800 Subject: [PATCH 14/20] Apply the binary compatibility validator Gradle plugin --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index c5588d5..1c808d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ tasks.wrapper { plugins { id("org.jetbrains.dokka") + id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" } dependencies { From 3a1c7d0d0a098db434d436158cbb54df550c1e9d Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 8 Nov 2024 10:56:24 +0800 Subject: [PATCH 15/20] Run `apiDump` --- lib/api/exposed-adt-mapping.api | 210 ++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 lib/api/exposed-adt-mapping.api diff --git a/lib/api/exposed-adt-mapping.api b/lib/api/exposed-adt-mapping.api new file mode 100644 index 0000000..f3b097b --- /dev/null +++ b/lib/api/exposed-adt-mapping.api @@ -0,0 +1,210 @@ +public abstract interface class com/huanshankeji/exposed/datamapping/DataMapper : com/huanshankeji/exposed/datamapping/DataQueryMapper, com/huanshankeji/exposed/datamapping/NullableDataMapper, com/huanshankeji/exposed/datamapping/SimpleDataMapper { +} + +public final class com/huanshankeji/exposed/datamapping/DataMapperInterfacesKt { + public static final fun updateBuilderSetter (Lcom/huanshankeji/exposed/datamapping/DataUpdateMapper;Ljava/lang/Object;)Lkotlin/jvm/functions/Function2; +} + +public abstract interface class com/huanshankeji/exposed/datamapping/DataQueryMapper : com/huanshankeji/exposed/datamapping/NullableDataQueryMapper { +} + +public abstract interface class com/huanshankeji/exposed/datamapping/DataUpdateMapper : com/huanshankeji/exposed/datamapping/NullableDataUpdateMapper { +} + +public abstract interface class com/huanshankeji/exposed/datamapping/NullableDataMapper : com/huanshankeji/exposed/datamapping/NullableDataQueryMapper, com/huanshankeji/exposed/datamapping/NullableDataUpdateMapper { +} + +public abstract interface class com/huanshankeji/exposed/datamapping/NullableDataQueryMapper : com/huanshankeji/exposed/datamapping/SimpleNullableDataQueryMapper { + public abstract fun getNeededColumns ()Ljava/util/List; +} + +public abstract interface class com/huanshankeji/exposed/datamapping/NullableDataUpdateMapper { + public abstract fun setUpdateBuilder (Ljava/lang/Object;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V +} + +public abstract interface class com/huanshankeji/exposed/datamapping/SimpleDataMapper : com/huanshankeji/exposed/datamapping/DataUpdateMapper, com/huanshankeji/exposed/datamapping/SimpleDataQueryMapper { +} + +public abstract interface class com/huanshankeji/exposed/datamapping/SimpleDataQueryMapper : com/huanshankeji/exposed/datamapping/SimpleNullableDataQueryMapper { +} + +public abstract interface class com/huanshankeji/exposed/datamapping/SimpleNullableDataQueryMapper { + public abstract fun resultRowToData (Lorg/jetbrains/exposed/sql/ResultRow;)Ljava/lang/Object; +} + +public final class com/huanshankeji/exposed/datamapping/TableKt { + public static final fun selectWithMapper (Lorg/jetbrains/exposed/sql/ColumnSet;Lcom/huanshankeji/exposed/datamapping/NullableDataQueryMapper;Lorg/jetbrains/exposed/sql/Op;)Lkotlin/sequences/Sequence; + public static synthetic fun selectWithMapper$default (Lorg/jetbrains/exposed/sql/ColumnSet;Lcom/huanshankeji/exposed/datamapping/NullableDataQueryMapper;Lorg/jetbrains/exposed/sql/Op;ILjava/lang/Object;)Lkotlin/sequences/Sequence; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ClassPropertyMappingKt { + public static final fun forEachColumn (Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping;Lkotlin/jvm/functions/Function1;)V + public static final fun forEachColumn (Ljava/util/List;Lkotlin/jvm/functions/Function1;)V + public static final fun getColumnByPropertyNameMap (Ljava/util/List;Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames;)Ljava/util/Map; + public static synthetic fun getColumnByPropertyNameMap$default (Ljava/util/List;Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames;ILjava/lang/Object;)Ljava/util/Map; + public static final fun getColumnSet (Ljava/util/List;)Ljava/util/Set; + public static final fun getColumnsWithPropertyNamesWithoutTypeParameter (Lorg/jetbrains/exposed/sql/Table;Lkotlin/reflect/KClass;)Lkotlin/sequences/Sequence; + public static synthetic fun getColumnsWithPropertyNamesWithoutTypeParameter$default (Lorg/jetbrains/exposed/sql/Table;Lkotlin/reflect/KClass;ILjava/lang/Object;)Lkotlin/sequences/Sequence; + public static final fun getDefaultClassPropertyColumnMappings (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeClass;Ljava/util/List;Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames;Ljava/util/Map;Ljava/util/List;)Ljava/util/List; + public static synthetic fun getDefaultClassPropertyColumnMappings$default (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeClass;Ljava/util/List;Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames;Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List; + public static final fun getDefaultNotNullExposedSqlPrimitiveClasses ()Ljava/util/List; + public static final fun isExposedSqlPrimitiveType (Lkotlin/reflect/KClass;)Z + public static final fun isExposedSqlPrimitiveType (Lkotlin/reflect/KType;)Z + public static final fun setUpdateBuilder (Ljava/util/List;Ljava/lang/Object;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V + public static final fun setUpdateBuilderColumnsToNulls (Ljava/util/List;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V + public static final fun setUpdateBuilderColumnsToNullsWithMappings (Ljava/util/List;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ColumnWithPropertyName { + public fun (Ljava/lang/String;Lorg/jetbrains/exposed/sql/Column;)V + public final fun component1 ()Ljava/lang/String; + public final fun component2 ()Lorg/jetbrains/exposed/sql/Column; + public final fun copy (Ljava/lang/String;Lorg/jetbrains/exposed/sql/Column;)Lcom/huanshankeji/exposed/datamapping/classproperty/ColumnWithPropertyName; + public static synthetic fun copy$default (Lcom/huanshankeji/exposed/datamapping/classproperty/ColumnWithPropertyName;Ljava/lang/String;Lorg/jetbrains/exposed/sql/Column;ILjava/lang/Object;)Lcom/huanshankeji/exposed/datamapping/classproperty/ColumnWithPropertyName; + public fun equals (Ljava/lang/Object;)Z + public final fun getColumn ()Lorg/jetbrains/exposed/sql/Column; + public final fun getPropertyName ()Ljava/lang/String; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames : java/lang/Enum { + public static final field CHOOSE_FIRST Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames; + public static final field THROW Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames; + public static fun getEntries ()Lkotlin/enums/EnumEntries; + public static fun valueOf (Ljava/lang/String;)Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames; + public static fun values ()[Lcom/huanshankeji/exposed/datamapping/classproperty/OnDuplicateColumnPropertyNames; +} + +public abstract class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping { + public synthetic fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getFctProperty ()Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$Custom : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping { + public fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1;Lcom/huanshankeji/exposed/datamapping/NullableDataMapper;)V + public final fun getNullableDataMapper ()Lcom/huanshankeji/exposed/datamapping/NullableDataMapper; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping { + public fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1;Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability;Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt;)V + public final fun getAdt ()Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt; + public final fun getNullability ()Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability; +} + +public abstract class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt { +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt$Product : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt { + public fun (Ljava/util/List;)V + public final fun getNestedMappings ()Ljava/util/List; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt$Sum : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Adt { + public fun (Ljava/util/Map;Lcom/huanshankeji/exposed/datamapping/classproperty/SumTypeCaseConfig;)V + public final fun getColumnsForAllSubclasses ()Ljava/util/List; + public final fun getSubclassMap ()Ljava/util/Map; + public final fun getSumTypeCaseConfig ()Lcom/huanshankeji/exposed/datamapping/classproperty/SumTypeCaseConfig; +} + +public abstract class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability { +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability$NonNullable : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability { + public fun ()V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability$Nullable : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$NestedClass$Nullability { + public fun (Lorg/jetbrains/exposed/sql/Column;)V + public final fun getWhetherNullDependentColumn ()Lorg/jetbrains/exposed/sql/Column; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$Skip : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping { + public fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1;)V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping$SqlPrimitive : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMapping { + public fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeProperty1;Lorg/jetbrains/exposed/sql/Column;)V + public final fun getColumn ()Lorg/jetbrains/exposed/sql/Column; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig { + public static final field Companion Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Companion; + public fun (Lkotlin/reflect/KType;ZLcom/huanshankeji/exposed/datamapping/NullableDataMapper;ZLjava/lang/String;Lorg/jetbrains/exposed/sql/Column;Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt;)V + public synthetic fun (Lkotlin/reflect/KType;ZLcom/huanshankeji/exposed/datamapping/NullableDataMapper;ZLjava/lang/String;Lorg/jetbrains/exposed/sql/Column;Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun getAdt ()Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt; + public final fun getColumnPropertyName ()Ljava/lang/String; + public final fun getCustomMapper ()Lcom/huanshankeji/exposed/datamapping/NullableDataMapper; + public final fun getSkip ()Z + public final fun getWhetherNullDependentColumn ()Lorg/jetbrains/exposed/sql/Column; +} + +public abstract class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt { +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt$Product : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt { + public fun (Ljava/util/Map;)V + public final fun getNestedConfigMap ()Ljava/util/Map; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt$Sum : com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt { + public static final field Companion Lcom/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt$Sum$Companion; + public fun (Lkotlin/reflect/KClass;Ljava/util/Map;Lcom/huanshankeji/exposed/datamapping/classproperty/SumTypeCaseConfig;)V + public final fun getSubclassProductConfigMapOverride ()Ljava/util/Map; + public final fun getSumTypeCaseConfig ()Lcom/huanshankeji/exposed/datamapping/classproperty/SumTypeCaseConfig; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Adt$Sum$Companion { +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/PropertyColumnMappingConfig$Companion { +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ReflectionBasedClassPropertyDataMapper : com/huanshankeji/exposed/datamapping/DataMapper { + public fun (Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeClass;Ljava/util/List;)V + public final fun getClassPropertyColumnMappings ()Ljava/util/List; + public final fun getFullConcreteTypeClass ()Lcom/huanshankeji/kotlin/reflect/fullconcretetype/FullConcreteTypeClass; + public fun getNeededColumns ()Ljava/util/List; + public fun resultRowToData (Lorg/jetbrains/exposed/sql/ResultRow;)Ljava/lang/Object; + public fun setUpdateBuilder (Ljava/lang/Object;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V +} + +public abstract interface class com/huanshankeji/exposed/datamapping/classproperty/ReflectionBasedSimpleClassPropertyDataMapper : com/huanshankeji/exposed/datamapping/SimpleDataMapper { + public abstract fun getDataPrimaryConstructor ()Lkotlin/reflect/KFunction; + public abstract fun getPropertyAndColumnPairs ()Ljava/util/List; + public abstract fun resultRowToData (Lorg/jetbrains/exposed/sql/ResultRow;)Ljava/lang/Object; + public abstract fun setUpdateBuilder (Ljava/lang/Object;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ReflectionBasedSimpleClassPropertyDataMapper$DefaultImpls { + public static fun resultRowToData (Lcom/huanshankeji/exposed/datamapping/classproperty/ReflectionBasedSimpleClassPropertyDataMapper;Lorg/jetbrains/exposed/sql/ResultRow;)Ljava/lang/Object; + public static fun setUpdateBuilder (Lcom/huanshankeji/exposed/datamapping/classproperty/ReflectionBasedSimpleClassPropertyDataMapper;Ljava/lang/Object;Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;)V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ReflectionFunctionInvocationException : java/lang/Exception { + public fun (Lkotlin/reflect/KFunction;[Ljava/lang/Object;Ljava/lang/Throwable;)V +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/ReflectionFunctionInvocationKt { + public static final fun callWithCatch (Lkotlin/reflect/KFunction;[Ljava/lang/Object;)Ljava/lang/Object; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/SimpleClassPropertyMappingKt { + public static final fun getColumnProperties (Lkotlin/reflect/KClass;)Lkotlin/sequences/Sequence; + public static final fun getColumnPropertyByNameMap (Lkotlin/reflect/KClass;)Ljava/util/Map; + public static final fun getValue (Lorg/jetbrains/exposed/sql/ResultRow;Lorg/jetbrains/exposed/sql/Column;)Ljava/lang/Object; + public static final fun innerJoinResultRowToData (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1; + public static final fun leftJoinResultRowToData (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/exposed/sql/Column;Lorg/jetbrains/exposed/sql/Column;)Lkotlin/jvm/functions/Function1; + public static final fun leftJoinResultRowToData (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lorg/jetbrains/exposed/sql/Column;)Lkotlin/jvm/functions/Function1; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/SumTypeCaseConfig { + public fun (Lorg/jetbrains/exposed/sql/Column;Lcom/huanshankeji/BidirectionalConversion;)V + public final fun getCaseValueColumn ()Lorg/jetbrains/exposed/sql/Column; + public final fun getCaseValueKClassConversion ()Lcom/huanshankeji/BidirectionalConversion; +} + +public final class com/huanshankeji/exposed/datamapping/classproperty/UpdateBuilderKt { + public static final fun setWithColumnPossiblyBeingEntityId (Lorg/jetbrains/exposed/sql/statements/UpdateBuilder;Lorg/jetbrains/exposed/sql/Column;Ljava/lang/Object;)V +} + From e21b7cef62485113b3e44fc1f725c932016bfe20 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 18 Nov 2024 11:25:32 +0800 Subject: [PATCH 16/20] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b11f00..8f9fbd2 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ object Mappers { ### CRUD operations -Call `updateBuilderSetter` to get a setter lambda to pass to `insert` or `update`. Call `selectWithMapper` to execute a query with a mapper (not available yet, available soon in 0.2.0). +Call `updateBuilderSetter` to get a setter lambda to pass to `insert` or `update`. Call `selectWithMapper` to execute a query with a mapper. ```kotlin val directorId = 1 From c632f9e4c8afeb40c02568bd94884a8c286896b9 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Tue, 26 Nov 2024 11:02:12 +0800 Subject: [PATCH 17/20] Bump Exposed to v0.56.0 and add a related "Add to your dependencies" section in README.md --- README.md | 12 ++++++++++++ buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b11f00..a696abc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,18 @@ A library based on [Exposed](https://github.com/JetBrains/Exposed) [DSL](https:/ This project is an attempt to provide an alternative to [Exposed DAO](https://github.com/JetBrains/Exposed/wiki/DAO) while supporting some more advanced functional programming features. See JetBrains/Exposed#24 for more details. +## Add to your dependencies + +### The Maven coordinate + +```kotlin +"com.huanshankeji:exposed-adt-mapping:$libraryVersion" +``` + +### **Important note** + +As Exposed is a library that has not reached stability yet and often has incompatible changes, you are recommended to stick to the same version of Exposed used by this library. The current version is v0.56.0. + ## Basic usage guide Please note that these APIs are far from stable. There are going to be refactors in future releases. diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index ab8d702..ff50cf3 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,7 +1,7 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.2.0-SNAPSHOT" +val projectVersion = "0.3.0-SNAPSHOT" -val commonVersions = CommonVersions(kotlinCommon = "0.5.1") +val commonVersions = CommonVersions(kotlinCommon = "0.5.1", exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 489fb0b5c5cd17c0768e5be6e80cd80c5c08e925 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Fri, 29 Nov 2024 20:44:44 +0800 Subject: [PATCH 18/20] Add change log for v0.3.0 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a2a577..430d06e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change log +## v0.3.0 / 2024-11-29 + +There are no functional changes in this release. + +Miscellaneous changes: + +* add API documentation generated by Dokka hosted at +* add CODE_OF_CONDUCT.md and CONTRIBUTING.md +* use the Kotlin binary compatibility validator +* bump Exposed to v0.56.0 + ## v0.2.0 / 2024-10-19 * bump Exposed to 0.53.0 From 0f7ad4254c7dfb0d26d118de8f4b802cc9ab08aa Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Fri, 29 Nov 2024 20:46:19 +0800 Subject: [PATCH 19/20] Bump our Gradle plugins to the stable version of v0.7.0 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 507988e..cab0d18 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.0.10")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.7.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } From 57e5f95e12d71ebace54c55cecce2b3f0a3ab326 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Fri, 29 Nov 2024 21:39:56 +0800 Subject: [PATCH 20/20] Bump "kotlin-common" to v0.6.0 --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index ff50cf3..91c715a 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -3,5 +3,5 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.3.0-SNAPSHOT" -val commonVersions = CommonVersions(kotlinCommon = "0.5.1", exposed = "0.56.0") +val commonVersions = CommonVersions(kotlinCommon = "0.6.0", exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions)