Skip to content

Commit 23eb52f

Browse files
authored
Merge pull request #16 from touchlab/rw/new-watchos-target
Add new watchos target, update yarn.lock, bump version
2 parents 6c24f3a + ba273b2 commit 23eb52f

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
2+
import org.jetbrains.kotlin.konan.target.Family.ANDROID
23
import org.jetbrains.kotlin.konan.target.Family.LINUX
34
import org.jetbrains.kotlin.konan.target.Family.MINGW
4-
import org.jetbrains.kotlin.konan.target.Family.ANDROID
55

66
plugins {
77
kotlin("multiplatform")
@@ -43,6 +43,8 @@ kotlin {
4343
watchosSimulatorArm64()
4444
tvosSimulatorArm64()
4545

46+
watchosDeviceArm64()
47+
4648
androidNativeArm32()
4749
androidNativeArm64()
4850
androidNativeX86()

gradle.properties

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,17 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
1716
kotlin.code.style=official
18-
1917
GROUP=co.touchlab
20-
VERSION_NAME=0.6.4
21-
KOTLIN_VERSION=1.7.10
22-
18+
VERSION_NAME=0.6.5
19+
KOTLIN_VERSION=1.8.10
2320
POM_URL=https://github.com/touchlab/TestHelp
2421
POM_DESCRIPTION=Kotlin Multiplatform Test Help
2522
POM_NAME=KMP Test Help
2623
POM_ARTIFACT_ID=testhelp
2724
POM_SCM_URL=https://github.com/touchlab/TestHelp
2825
POM_SCM_CONNECTION=scm:git:git://github.com/touchlab/TestHelp.git
2926
POM_SCM_DEV_CONNECTION=scm:git:git://github.com/touchlab/TestHelp.git
30-
3127
POM_LICENCE_NAME=The Apache Software License, Version 2.0
3228
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
3329
POM_LICENCE_DIST=repo
@@ -41,4 +37,4 @@ kotlin.js.compiler=both
4137

4238
kotlin.mpp.enableGranularSourceSetsMetadata=true
4339
kotlin.native.enableDependencyPropagation=false
44-
kotlin.mpp.commonizerLogLevel=info
40+
kotlin.mpp.commonizerLogLevel=info

kotlin-js-store/yarn.lock

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,16 @@ acorn-import-assertions@^1.7.6:
229229
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
230230
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
231231

232-
acorn@^8.4.1, acorn@^8.5.0:
232+
acorn@^8.5.0:
233233
version "8.7.0"
234234
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
235235
integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
236236

237+
acorn@^8.7.1:
238+
version "8.8.2"
239+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
240+
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
241+
237242
ajv-keywords@^3.5.2:
238243
version "3.5.2"
239244
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -598,10 +603,10 @@ engine.io@~6.2.0:
598603
engine.io-parser "~5.0.3"
599604
ws "~8.2.3"
600605

601-
enhanced-resolve@^5.9.3:
602-
version "5.10.0"
603-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
604-
integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
606+
enhanced-resolve@^5.10.0:
607+
version "5.12.0"
608+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
609+
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
605610
dependencies:
606611
graceful-fs "^4.2.4"
607612
tapable "^2.2.0"
@@ -1694,7 +1699,7 @@ void-elements@^2.0.0:
16941699
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
16951700
integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
16961701

1697-
watchpack@^2.3.1:
1702+
watchpack@^2.4.0:
16981703
version "2.4.0"
16991704
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
17001705
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -1740,21 +1745,21 @@ webpack-sources@^3.2.3:
17401745
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
17411746
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
17421747

1743-
webpack@5.73.0:
1744-
version "5.73.0"
1745-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
1746-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
1748+
webpack@5.74.0:
1749+
version "5.74.0"
1750+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
1751+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
17471752
dependencies:
17481753
"@types/eslint-scope" "^3.7.3"
17491754
"@types/estree" "^0.0.51"
17501755
"@webassemblyjs/ast" "1.11.1"
17511756
"@webassemblyjs/wasm-edit" "1.11.1"
17521757
"@webassemblyjs/wasm-parser" "1.11.1"
1753-
acorn "^8.4.1"
1758+
acorn "^8.7.1"
17541759
acorn-import-assertions "^1.7.6"
17551760
browserslist "^4.14.5"
17561761
chrome-trace-event "^1.0.2"
1757-
enhanced-resolve "^5.9.3"
1762+
enhanced-resolve "^5.10.0"
17581763
es-module-lexer "^0.9.0"
17591764
eslint-scope "5.1.1"
17601765
events "^3.2.0"
@@ -1767,7 +1772,7 @@ [email protected]:
17671772
schema-utils "^3.1.0"
17681773
tapable "^2.1.1"
17691774
terser-webpack-plugin "^5.1.3"
1770-
watchpack "^2.3.1"
1775+
watchpack "^2.4.0"
17711776
webpack-sources "^3.2.3"
17721777

17731778
which@^1.2.1:

0 commit comments

Comments
 (0)