Skip to content

Commit 26fc9d1

Browse files
mpetuskampetuska
committed
Gha debug
1 parent e41ce80 commit 26fc9d1

File tree

10 files changed

+41
-31
lines changed

10 files changed

+41
-31
lines changed

‎build-conventions/src/main/kotlin/convention.common.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ repositories {
1010
mavenCentral()
1111
google()
1212
gradlePluginPortal()
13+
if (findProperty("project.enableSnapshots") == "true") {
14+
maven("https://oss.sonatype.org/content/repositories/snapshots")
15+
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
16+
}
1317
}
1418

1519
printlnCI(

‎build-conventions/src/main/kotlin/convention.control.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ fun control(targets: NamedDomainObjectCollection<KotlinTarget>) {
3434
}
3535
}
3636
compilations.all {
37-
compileKotlinTask.onlyIf(enabled)
37+
compileTaskProvider {
38+
onlyIf(enabled)
39+
}
3840
}
3941
}
4042
}

‎build-conventions/src/main/kotlin/convention.library-android.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,12 @@ android {
99
minSdk = 21
1010
targetSdk = 32
1111
// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
12+
publishing {
13+
multipleVariants {
14+
withSourcesJar()
15+
withJavadocJar()
16+
allVariants()
17+
}
18+
}
1219
}
1320
}

‎build-conventions/src/main/kotlin/convention.library-compose.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kotlin {
2424
implementation(compose.uiTestJUnit4)
2525
}
2626
}
27-
named("androidTest") {
27+
named("androidUnitTest") {
2828
dependencies {
2929
// implementation("androidx.compose.material:material:_")
3030
// implementation("androidx.compose.ui:ui-test-junit4:_")

‎build-conventions/src/main/kotlin/convention.publishing-nexus.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ nexusPublishing {
88
sonatype {
99
nexusUrl by uri("https://s01.oss.sonatype.org/service/local/")
1010
snapshotRepositoryUrl by uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
11+
println("MPE: sonatypeUsername: ${findProperty("sonatypeUsername")?.let {"EXISTS"}}")
12+
println("MPE: sonatypePassword: ${findProperty("sonatypePassword")?.let {"EXISTS"}}")
1113
}
1214
}
1315
}

‎build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ gradleEnterprise {
1212
}
1313
}
1414

15+
android {
16+
namespace = "org.reduxkotlin.compose"
17+
}
18+
1519
kotlin {
1620
sourceSets {
1721
named("commonMain") {

‎gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ kotlin.js.generate.externals=false
1010
kotlin.js.compiler=ir
1111
kotlin.incremental.js=true
1212
kotlin.mpp.stability.nowarn=true
13+
kotlin.mpp.androidSourceSetLayoutVersion=2
1314
kotlin.native.ignoreDisabledTargets=true
1415
android.useAndroidX=true
1516
kotlin.js.browser.karma.browsers=chromium-headless
17+
android.disableAutomaticComponentCreation=true
1618
#======================================== GitHub ========================================
1719
gh.owner.id=reduxkotlin
1820
gh.owner.name=reduxkotlin.org
@@ -23,5 +25,6 @@ group=org.reduxkotlin
2325
description=Compose Multiplatform integration for Redux-Kotlin
2426
version=0.1.0-SNAPSHOT
2527
#======================================== Build =========================================
28+
project.enableSnapshots=true
2629
# linux | macos | windows
2730
project.mainOS=linux

‎gradle/versions.properties‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,21 @@
99

1010
#======================================= Plugins ========================================
1111
plugin.android=7.3.1
12-
1312
version.kotlinx.coroutines=1.6.4
14-
15-
version.org.jetbrains.compose..compose-gradle-plugin=1.2.2
16-
13+
version.org.jetbrains.compose..compose-gradle-plugin=1.3.0-rc02
1714
version.com.github.jakemarsden..git-hooks-gradle-plugin=0.0.2
18-
1915
version.gradle.plugin.com.github.jengelman.gradle.plugins..shadow=7.0.0
20-
2116
version.io.github.gradle-nexus..publish-plugin=1.1.0
22-
2317
version.detekt=1.22.0
24-
2518
version.klip=0.4.1
26-
2719
version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.20
28-
2920
#====================================== Libraries =======================================
3021
version.androidx.compose=1.1.1
31-
3222
version.androidx.compose.material=1.1.1
33-
3423
version.androidx.compose.ui=1.1.1
35-
3624
version.androidx.test.espresso=3.4.0
37-
3825
version.androidx.test.rules=1.4.0
39-
4026
version.androidx.test.runner=1.4.0
41-
4227
version.kotlinx.serialization=1.3.3
43-
44-
version.kotlin=1.7.20
45-
28+
version.kotlin=1.8.0
4629
version.org.reduxkotlin..redux-kotlin=0.5.5

‎kotlin-js-store/yarn.lock‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,16 @@ acorn-import-assertions@^1.7.6:
276276
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
277277
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
278278

279-
acorn@^8.4.1, acorn@^8.5.0:
279+
acorn@^8.5.0:
280280
version "8.8.0"
281281
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
282282
integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
283283

284+
acorn@^8.7.1:
285+
version "8.8.1"
286+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
287+
integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
288+
284289
ajv-keywords@^3.5.2:
285290
version "3.5.2"
286291
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -639,7 +644,7 @@ engine.io@~6.2.1:
639644
engine.io-parser "~5.0.3"
640645
ws "~8.2.3"
641646

642-
enhanced-resolve@^5.9.3:
647+
enhanced-resolve@^5.10.0:
643648
version "5.12.0"
644649
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
645650
integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
@@ -1754,7 +1759,7 @@ void-elements@^2.0.0:
17541759
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
17551760
integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
17561761

1757-
watchpack@^2.3.1:
1762+
watchpack@^2.4.0:
17581763
version "2.4.0"
17591764
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
17601765
integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
@@ -1800,21 +1805,21 @@ webpack-sources@^3.2.3:
18001805
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
18011806
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
18021807

1803-
webpack@5.73.0:
1804-
version "5.73.0"
1805-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38"
1806-
integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==
1808+
webpack@5.74.0:
1809+
version "5.74.0"
1810+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
1811+
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
18071812
dependencies:
18081813
"@types/eslint-scope" "^3.7.3"
18091814
"@types/estree" "^0.0.51"
18101815
"@webassemblyjs/ast" "1.11.1"
18111816
"@webassemblyjs/wasm-edit" "1.11.1"
18121817
"@webassemblyjs/wasm-parser" "1.11.1"
1813-
acorn "^8.4.1"
1818+
acorn "^8.7.1"
18141819
acorn-import-assertions "^1.7.6"
18151820
browserslist "^4.14.5"
18161821
chrome-trace-event "^1.0.2"
1817-
enhanced-resolve "^5.9.3"
1822+
enhanced-resolve "^5.10.0"
18181823
es-module-lexer "^0.9.0"
18191824
eslint-scope "5.1.1"
18201825
events "^3.2.0"
@@ -1827,7 +1832,7 @@ webpack@5.73.0:
18271832
schema-utils "^3.1.0"
18281833
tapable "^2.1.1"
18291834
terser-webpack-plugin "^5.1.3"
1830-
watchpack "^2.3.1"
1835+
watchpack "^2.4.0"
18311836
webpack-sources "^3.2.3"
18321837

18331838
which@^1.2.1:

‎src/main/AndroidManifest.xml‎ renamed to ‎src/androidMain/AndroidManifest.xml‎

File renamed without changes.

0 commit comments

Comments
 (0)