From 4ce18e7520b47d1b2fb2bc69354d531e7d9d46ef Mon Sep 17 00:00:00 2001 From: SlashNephy Date: Sun, 1 May 2022 11:13:44 +0900 Subject: [PATCH] upgrade(deps): Kotlin 1.6.10 -> 1.6.21 Signed-off-by: SlashNephy --- .github/workflows/check.yml | 11 ++++---- .github/workflows/docs.yml | 9 ++++--- .github/workflows/maven.yml | 9 ++++--- README.md | 8 +++--- build.gradle.kts | 36 +++++++++++++------------- kotlin-js-store/yarn.lock | 51 +++++++++++++++++++++++-------------- 6 files changed, 68 insertions(+), 56 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ce9d762fe..e40b26b87 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -3,8 +3,6 @@ name: Check on: push: paths-ignore: - - .gitignore - - LICENSE - '**.md' branches-ignore: - 'releases/**' @@ -21,19 +19,20 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Using Caches - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} restore-keys: | ${{ runner.os }}-gradle- - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: 8 - name: Grant Execute Permission to gradlew run: chmod +x gradlew diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4fc40be80..6c4e22ff0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -10,19 +10,20 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Using Caches - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} restore-keys: | ${{ runner.os }}-gradle- - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: 8 - name: Grant Execute Permission to gradlew run: chmod +x gradlew diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 116c3a45b..1375b51f6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,19 +11,20 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Using Caches - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} restore-keys: | ${{ runner.os }}-gradle- - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: 1.8 + distribution: 'temurin' + java-version: 8 - name: Grant Execute Permission to gradlew run: chmod +x gradlew diff --git a/README.md b/README.md index 40c901633..907f7ef45 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Penicillin: Modern powerful Twitter API wrapper for Kotlin Multiplatform -[![Kotlin](https://img.shields.io/badge/Kotlin-1.5-blue.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/Kotlin-1.6-blue.svg)](https://kotlinlang.org) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/StarryBlueSky/Penicillin)](https://github.com/StarryBlueSky/Penicillin/releases) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/StarryBlueSky/Penicillin/Check)](https://github.com/StarryBlueSky/Penicillin) [![license](https://img.shields.io/github/license/StarryBlueSky/Penicillin.svg)](https://github.com/StarryBlueSky/Penicillin/blob/master/LICENSE) @@ -56,8 +56,8 @@ dependencies { // Choose your favorite engine from https://ktor.io/clients/http-client/engines.html // The version should match the version of Ktor that Penicillin is using. - implementation("io.ktor:ktor-client-apache:$KtorVersion") - implementation("io.ktor:ktor-client-cio:$KtorVersion") + implementation("io.ktor:ktor-client-apache:1.6.8") + implementation("io.ktor:ktor-client-cio:1.6.8") } ``` @@ -65,4 +65,4 @@ dependencies { Penicillin is provided under the MIT license. -Copyright (c) 2017-2021 StarryBlueSky. +Copyright (c) 2017-2022 StarryBlueSky. diff --git a/build.gradle.kts b/build.gradle.kts index b041efa7c..21994ea66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,17 @@ import blue.starry.scriptextender.EnvReference plugins { - kotlin("multiplatform") version "1.6.10" - kotlin("plugin.serialization") version "1.6.10" + kotlin("multiplatform") version "1.6.21" + kotlin("plugin.serialization") version "1.6.21" - id("org.jlleitschuh.gradle.ktlint") version "10.0.0" - id("com.adarshr.test-logger") version "3.0.0" + id("org.jlleitschuh.gradle.ktlint") version "10.2.1" + id("com.adarshr.test-logger") version "3.2.0" id("net.rdrei.android.buildtimetracker") version "0.11.0" `maven-publish` signing id("io.codearte.nexus-staging") version "0.30.0" - id("org.jetbrains.dokka") version "1.6.10" + id("org.jetbrains.dokka") version "1.6.21" id("blue.starry.scriptextender") version "0.0.2" } @@ -81,13 +81,13 @@ kotlin { sourceSets { commonMain { dependencies { - api("io.ktor:ktor-client-core:1.6.7") + api("io.ktor:ktor-client-core:1.6.8") api("blue.starry:jsonkt:6.1.2") api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") - api("com.benasher44:uuid:0.3.1") - api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.1") + api("com.benasher44:uuid:0.4.0") + api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2") api("io.github.microutils:kotlin-logging:2.1.21") } } @@ -105,17 +105,17 @@ kotlin { implementation(kotlin("reflect")) implementation(kotlin("test")) - implementation("io.ktor:ktor-client-apache:1.6.7") - implementation("io.ktor:ktor-client-cio:1.6.7") - implementation("io.ktor:ktor-client-jetty:1.6.7") - implementation("io.ktor:ktor-client-okhttp:1.6.7") - implementation("io.ktor:ktor-client-mock-jvm:1.6.7") + implementation("io.ktor:ktor-client-apache:1.6.8") + implementation("io.ktor:ktor-client-cio:1.6.8") + implementation("io.ktor:ktor-client-jetty:1.6.8") + implementation("io.ktor:ktor-client-okhttp:1.6.8") + implementation("io.ktor:ktor-client-mock-jvm:1.6.8") implementation(kotlin("test-junit5")) implementation("org.junit.jupiter:junit-jupiter:5.8.2") implementation("com.twitter.twittertext:twitter-text:3.1.0") - implementation("com.google.guava:guava:31.0.1-jre") + implementation("com.google.guava:guava:31.1-jre") implementation("ch.qos.logback:logback-classic:1.3.0-alpha12") } @@ -123,16 +123,16 @@ kotlin { named("jsMain") { dependencies { - api("io.ktor:ktor-client-js:1.6.7") + api("io.ktor:ktor-client-js:1.6.8") - implementation(npm("crypto-js", "4.0.0")) + implementation(npm("crypto-js", "4.1.1")) } } named("jsTest") { dependencies { implementation(kotlin("test-js")) - implementation("io.ktor:ktor-client-mock-js:1.6.7") + implementation("io.ktor:ktor-client-mock-js:1.6.8") } } } @@ -142,7 +142,6 @@ kotlin { kotlinOptions { apiVersion = "1.6" languageVersion = "1.6" - allWarningsAsErrors = true verbose = true } } @@ -282,7 +281,6 @@ signing { sign(publishing.publications) if (Env.SigningKey.isPresent) { - @Suppress("UnstableApiUsage") useInMemoryPgpKeys( Env.SigningKeyId.value, Env.SigningKey.value, diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 455157a89..ccafe8d66 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -49,11 +49,6 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -143,10 +138,10 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -crypto-js@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc" - integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg== +crypto-js@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" + integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== debug@4.3.2: version "4.3.2" @@ -403,10 +398,12 @@ nanoid@3.1.25: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== -node-fetch@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -535,11 +532,29 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + typescript@3.9.5: version "3.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -566,12 +581,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== y18n@^5.0.5: version "5.0.8"