Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !11022
An error occurred while fetching the assigned milestone of the selected merge_request.

[Kotlin][Multiplatform] Upgrade Kotlin to version 1.6.0

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/Airthings/kotlin-1.6.0 into master 3 years ago
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 2

Created by: tkirshboim

PR Description

  • The PR upgrades the Kotlin version used by the Kotlin Multiplatform template to version 1.6.0.
  • Ktor is upgraded to version 1.6.4, the the recommended version to use with Kotlin 1.6.0.

Upgrading to 1.6.0 was deliberately avoided in #10900 because Jetpack Compose was not compatible with Kotlin 1.6.0. This issue is now resolved because Jetpack Compose can be used with Kotlin 1.6.0 when using Compose compiler version 1.1.0-beta04.

This change was validated in KMM demo project that uses this branch to generate the petstore sample code and Jetpack Compose: https://github.com/Airthings/openapi-multiplatform-multi-module/commit/050f0862b6575ea34deb4e3ca2c4321527a587b2

CCs

Kotlin technical committee: @jimschubert @dr4ke616 @karismann @Zomzog @andrewemery @4brunu @yutaka0m

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.
Compare
  • master (base)

and
  • latest version
    490c0649
    1 commit, 2 years ago

2 files
+ 8
- 8

    Preferences

    File browser
    Compare changes
modules/…/…/…/…/‎…/…/multiplatform‎
build.gradle‎.kts.mustache‎ +4 -4
samples/client/…/k‎otlin-multiplatform‎
build.gr‎adle.kts‎ +4 -4
modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache
+ 4
- 4
  • View file @ 490c0649

  • Edit in single-file editor

  • Open in Web IDE


import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "1.5.31" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "1.5.31" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("multiplatform"){{^omitGradlePluginVersions}} version "1.6.0" // kotlin_version{{/omitGradlePluginVersions}}
kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "1.6.0" // kotlin_version{{/omitGradlePluginVersions}}
}
group = "{{groupId}}"
version = "{{artifactVersion}}"
val kotlin_version = "1.5.31"
val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.3"
val ktor_version = "1.6.4"
repositories {
mavenCentral()
samples/client/petstore/kotlin-multiplatform/build.gradle.kts
+ 4
- 4
  • View file @ 490c0649

  • Edit in single-file editor

  • Open in Web IDE


import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform") version "1.5.31" // kotlin_version
kotlin("plugin.serialization") version "1.5.31" // kotlin_version
kotlin("multiplatform") version "1.6.0" // kotlin_version
kotlin("plugin.serialization") version "1.6.0" // kotlin_version
}
group = "org.openapitools"
version = "1.0.0"
val kotlin_version = "1.5.31"
val kotlin_version = "1.6.0"
val coroutines_version = "1.5.2"
val serialization_version = "1.3.0"
val ktor_version = "1.6.3"
val ktor_version = "1.6.4"
repositories {
mavenCentral()
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: github/fork/Airthings/kotlin-1.6.0

Menu

Explore Projects Groups Snippets