From b2e38f72b9306a37f779babf05d0133368e5a508 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 8 Jan 2022 14:12:57 +0600 Subject: [PATCH 1/3] start 0.9.1 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d19da3e553..2ef81eff942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.9.1 + ## 0.9.0 * `Versions`: diff --git a/gradle.properties b/gradle.properties index 8581ddf9b26..fdee338a4b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,5 +45,5 @@ dokka_version=1.6.0 # Project data group=dev.inmo -version=0.9.0 -android_code_version=90 +version=0.9.1 +android_code_version=91 From 00cc214754be9630d4f98bd14bc8b3944c24bf9f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 8 Jan 2022 14:14:44 +0600 Subject: [PATCH 2/3] repo exposed updates --- CHANGELOG.md | 7 +++++++ .../repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt | 4 ++-- .../exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt | 4 ++-- .../exposed/versions/ExposedStandardVersionsRepoProxy.kt | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ef81eff942..cbc3d48b81c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.9.1 +* `Repos`: + * `Exposed`: + * Default realizations of standard interfaces for exposed DB are using public fields for now: + * `ExposedReadKeyValueRepo` + * `ExposedReadOneToManyKeyValueRepo` + * `ExposedStandardVersionsRepoProxy` + ## 0.9.0 * `Versions`: diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt index 8cb3228cf47..ecf87dc312e 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt @@ -12,8 +12,8 @@ open class ExposedReadKeyValueRepo( valueColumnAllocator: ColumnAllocator, tableName: String? = null ) : ReadStandardKeyValueRepo, ExposedRepo, Table(tableName ?: "") { - protected val keyColumn: Column = keyColumnAllocator() - protected val valueColumn: Column = valueColumnAllocator() + val keyColumn: Column = keyColumnAllocator() + val valueColumn: Column = valueColumnAllocator() override val primaryKey: PrimaryKey = PrimaryKey(keyColumn, valueColumn) init { initTable() } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt index 37d5b9f0feb..c63f4e75946 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt @@ -12,8 +12,8 @@ open class ExposedReadOneToManyKeyValueRepo( valueColumnAllocator: ColumnAllocator, tableName: String? = null ) : ReadOneToManyKeyValueRepo, ExposedRepo, Table(tableName ?: "") { - protected val keyColumn: Column = keyColumnAllocator() - protected val valueColumn: Column = valueColumnAllocator() + val keyColumn: Column = keyColumnAllocator() + val valueColumn: Column = valueColumnAllocator() init { initTable() } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt index a561949537e..0c5a6c1e39d 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/versions/ExposedStandardVersionsRepoProxy.kt @@ -18,8 +18,8 @@ inline fun versionsRepo(database: Database): VersionsRepo = StandardVe class ExposedStandardVersionsRepoProxy( override val database: Database ) : StandardVersionsRepoProxy, Table("ExposedVersionsProxy"), ExposedRepo { - private val tableNameColumn = text("tableName") - private val tableVersionColumn = integer("tableName") + val tableNameColumn = text("tableName") + val tableVersionColumn = integer("tableName") init { initTable() From 916f2f96f47db7756ba25d8c695aec8f25d1cc0b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 8 Jan 2022 14:35:28 +0600 Subject: [PATCH 3/3] typealiases for exposed one to many --- CHANGELOG.md | 3 +++ publish.gradle | 20 ++++++++++++++----- publish.kpsb | 2 +- .../onetomany/ExposedOneToManyKeyValueRepo.kt | 1 + .../ExposedReadOneToManyKeyValueRepo.kt | 3 +++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbc3d48b81c..b4f282a13ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ * `ExposedReadKeyValueRepo` * `ExposedReadOneToManyKeyValueRepo` * `ExposedStandardVersionsRepoProxy` + * New typealiases for one to many exposed realizations: + * `ExposedReadKeyValuesRepo` + * `ExposedKeyValuesRepo` ## 0.9.0 diff --git a/publish.gradle b/publish.gradle index 53ad96d9e30..7d7baf59fbf 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,5 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' @@ -69,8 +68,19 @@ publishing { } } } - -signing { - useGpgCmd() - sign publishing.publications + +if (project.hasProperty("signing.gnupg.keyName")) { + apply plugin: 'signing' + + signing { + useGpgCmd() + + sign publishing.publications + } + + task signAll { + tasks.withType(Sign).forEach { + dependsOn(it) + } + } } diff --git a/publish.kpsb b/publish.kpsb index 775a054a27c..10fb2f82ba5 100644 --- a/publish.kpsb +++ b/publish.kpsb @@ -1 +1 @@ -{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}} \ No newline at end of file diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt index 9d327ac846c..6d203842e98 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt @@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.* import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction +typealias ExposedKeyValuesRepo = ExposedOneToManyKeyValueRepo open class ExposedOneToManyKeyValueRepo( database: Database, keyColumnAllocator: ColumnAllocator, diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt index c63f4e75946..7c8fa8a2fd7 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt @@ -3,9 +3,12 @@ package dev.inmo.micro_utils.repos.exposed.onetomany import dev.inmo.micro_utils.pagination.* import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo import dev.inmo.micro_utils.repos.exposed.* +import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedReadKeyValueRepo import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction +typealias ExposedReadKeyValuesRepo = ExposedReadOneToManyKeyValueRepo + open class ExposedReadOneToManyKeyValueRepo( override val database: Database, keyColumnAllocator: ColumnAllocator,