From 2eebb8b4109ae21c6683841fb91e80967e0d737f Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Wed, 3 Jan 2024 13:54:47 +0000 Subject: [PATCH 1/3] Bump the version -> `2.0.0-SNAPSHOT.192`. --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 20550eab..4c7d4506 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -24,4 +24,4 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -val versionToPublish: String by extra("2.0.0-SNAPSHOT.191") +val versionToPublish: String by extra("2.0.0-SNAPSHOT.192") From fce8c5bf09f41b79977b1b82550df39937945f2d Mon Sep 17 00:00:00 2001 From: Alex Tymchenko Date: Wed, 3 Jan 2024 14:09:05 +0000 Subject: [PATCH 2/3] Migrate to the latest `config`, address version conflicts, use the updated descriptor-set-generation approach. --- .idea/kotlinc.xml | 6 +- build.gradle.kts | 1 + buildSrc/build.gradle.kts | 83 ++++++++++--------- .../io/spine/internal/dependency/IntelliJ.kt | 1 + .../io/spine/internal/dependency/Kotlin.kt | 4 +- .../io/spine/internal/dependency/KotlinX.kt | 41 +++++++++ .../io/spine/internal/dependency/ProtoData.kt | 34 ++++++-- .../io/spine/internal/dependency/Protobuf.kt | 2 +- .../io/spine/internal/dependency/Spine.kt | 14 ++-- .../io/spine/internal/gradle/Repositories.kt | 10 +++ .../gradle/protobuf/ProtoTaskExtensions.kt | 49 ++++++++++- buildSrc/src/main/kotlin/module.gradle.kts | 1 + config | 2 +- 13 files changed, 187 insertions(+), 61 deletions(-) create mode 100644 buildSrc/src/main/kotlin/io/spine/internal/dependency/KotlinX.kt diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 1de9dd48..9bfa2247 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -4,10 +4,10 @@