Skip to content

Commit 50c836f

Browse files
mikepenzmikepenz
authored
Merge pull request #1168 from mikepenz/develop
dev -> main
2 parents e1947a4 + 5a2d67e commit 50c836f

File tree

21 files changed

+211
-217
lines changed

21 files changed

+211
-217
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ This library collects dependency details, including licenses at compile time, an
4141

4242
## Latest releases 🛠
4343

44+
- Compose 1.8.x | Plugin refactor | [v12.1.2](https://github.com/mikepenz/AboutLibraries/tree/12.1.2)
4445
- Compose UI updates | Gradle Plugin refresh | [v12.0.1](https://github.com/mikepenz/AboutLibraries/tree/12.0.1)
45-
- Compose 1.8.x | Plugin refactor | [v12.1.1](https://github.com/mikepenz/AboutLibraries/tree/12.1.1)
4646

4747
## Gradle Plugin
4848

‎app-desktop/src/commonMain/composeResources/files/aboutlibraries.json‎

Lines changed: 40 additions & 43 deletions
Large diffs are not rendered by default.

‎app-test/files/aboutlibraries.json‎

Lines changed: 1 addition & 15 deletions
Large diffs are not rendered by default.

‎app-wasm/src/commonMain/composeResources/files/aboutlibraries.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
"name": "Compose Multiplatform Team"
304304
}
305305
],
306-
"artifactVersion": "1.8.0-rc01",
306+
"artifactVersion": "1.8.0",
307307
"description": "Compose animation library",
308308
"scm": {
309309
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -327,7 +327,7 @@
327327
"name": "Compose Multiplatform Team"
328328
}
329329
],
330-
"artifactVersion": "1.8.0-rc01",
330+
"artifactVersion": "1.8.0",
331331
"description": "Animation engine and animation primitives that are the building blocks of the Compose animation library",
332332
"scm": {
333333
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -351,7 +351,7 @@
351351
"name": "Compose Multiplatform Team"
352352
}
353353
],
354-
"artifactVersion": "1.8.0-rc01",
354+
"artifactVersion": "1.8.0",
355355
"description": "Animation engine and animation primitives that are the building blocks of the Compose animation library",
356356
"scm": {
357357
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -375,7 +375,7 @@
375375
"name": "Compose Multiplatform Team"
376376
}
377377
],
378-
"artifactVersion": "1.8.0-rc01",
378+
"artifactVersion": "1.8.0",
379379
"description": "Compose animation library",
380380
"scm": {
381381
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -447,7 +447,7 @@
447447
"name": "Compose Multiplatform Team"
448448
}
449449
],
450-
"artifactVersion": "1.8.0-rc01",
450+
"artifactVersion": "1.8.0",
451451
"description": "Standalone efficient collections.",
452452
"scm": {
453453
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -471,7 +471,7 @@
471471
"name": "Compose Multiplatform Team"
472472
}
473473
],
474-
"artifactVersion": "1.8.0-rc01",
474+
"artifactVersion": "1.8.0",
475475
"description": "Standalone efficient collections.",
476476
"scm": {
477477
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -495,7 +495,7 @@
495495
"name": "Compose Multiplatform Team"
496496
}
497497
],
498-
"artifactVersion": "1.8.0-rc01",
498+
"artifactVersion": "1.8.0",
499499
"description": "Resources for Compose JB",
500500
"scm": {
501501
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -519,7 +519,7 @@
519519
"name": "Compose Multiplatform Team"
520520
}
521521
],
522-
"artifactVersion": "1.8.0-rc01",
522+
"artifactVersion": "1.8.0",
523523
"description": "Resources for Compose JB",
524524
"scm": {
525525
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -543,7 +543,7 @@
543543
"name": "Compose Multiplatform Team"
544544
}
545545
],
546-
"artifactVersion": "1.8.0-rc01",
546+
"artifactVersion": "1.8.0",
547547
"description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers",
548548
"scm": {
549549
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -567,7 +567,7 @@
567567
"name": "Compose Multiplatform Team"
568568
}
569569
],
570-
"artifactVersion": "1.8.0-rc01",
570+
"artifactVersion": "1.8.0",
571571
"description": "Compose layout implementations",
572572
"scm": {
573573
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -591,7 +591,7 @@
591591
"name": "Compose Multiplatform Team"
592592
}
593593
],
594-
"artifactVersion": "1.8.0-rc01",
594+
"artifactVersion": "1.8.0",
595595
"description": "Compose layout implementations",
596596
"scm": {
597597
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -615,7 +615,7 @@
615615
"name": "Compose Multiplatform Team"
616616
}
617617
],
618-
"artifactVersion": "1.8.0-rc01",
618+
"artifactVersion": "1.8.0",
619619
"description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers",
620620
"scm": {
621621
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -639,7 +639,7 @@
639639
"name": "Compose Multiplatform Team"
640640
}
641641
],
642-
"artifactVersion": "1.8.0-rc01",
642+
"artifactVersion": "1.8.0",
643643
"description": "Compose Material You Design Components library",
644644
"scm": {
645645
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -663,7 +663,7 @@
663663
"name": "Compose Multiplatform Team"
664664
}
665665
],
666-
"artifactVersion": "1.8.0-rc01",
666+
"artifactVersion": "1.8.0",
667667
"description": "Compose Material You Design Components library",
668668
"scm": {
669669
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -687,7 +687,7 @@
687687
"name": "Compose Multiplatform Team"
688688
}
689689
],
690-
"artifactVersion": "1.8.0-rc01",
690+
"artifactVersion": "1.8.0",
691691
"description": "Compose Material Design Components library",
692692
"scm": {
693693
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -711,7 +711,7 @@
711711
"name": "Compose Multiplatform Team"
712712
}
713713
],
714-
"artifactVersion": "1.8.0-rc01",
714+
"artifactVersion": "1.8.0",
715715
"description": "Material ripple used to build interactive components",
716716
"scm": {
717717
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -735,7 +735,7 @@
735735
"name": "Compose Multiplatform Team"
736736
}
737737
],
738-
"artifactVersion": "1.8.0-rc01",
738+
"artifactVersion": "1.8.0",
739739
"description": "Material ripple used to build interactive components",
740740
"scm": {
741741
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -759,7 +759,7 @@
759759
"name": "Compose Multiplatform Team"
760760
}
761761
],
762-
"artifactVersion": "1.8.0-rc01",
762+
"artifactVersion": "1.8.0",
763763
"description": "Compose Material Design Components library",
764764
"scm": {
765765
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -783,7 +783,7 @@
783783
"name": "Compose Multiplatform Team"
784784
}
785785
],
786-
"artifactVersion": "1.8.0-rc01",
786+
"artifactVersion": "1.8.0",
787787
"description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API",
788788
"scm": {
789789
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -807,7 +807,7 @@
807807
"name": "Compose Multiplatform Team"
808808
}
809809
],
810-
"artifactVersion": "1.8.0-rc01",
810+
"artifactVersion": "1.8.0",
811811
"description": "Compose components that allow saving and restoring the local ui state",
812812
"scm": {
813813
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -831,7 +831,7 @@
831831
"name": "Compose Multiplatform Team"
832832
}
833833
],
834-
"artifactVersion": "1.8.0-rc01",
834+
"artifactVersion": "1.8.0",
835835
"description": "Compose components that allow saving and restoring the local ui state",
836836
"scm": {
837837
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -855,7 +855,7 @@
855855
"name": "Compose Multiplatform Team"
856856
}
857857
],
858-
"artifactVersion": "1.8.0-rc01",
858+
"artifactVersion": "1.8.0",
859859
"description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API",
860860
"scm": {
861861
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -879,7 +879,7 @@
879879
"name": "Compose Multiplatform Team"
880880
}
881881
],
882-
"artifactVersion": "1.8.0-rc01",
882+
"artifactVersion": "1.8.0",
883883
"description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.",
884884
"scm": {
885885
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -903,7 +903,7 @@
903903
"name": "Compose Multiplatform Team"
904904
}
905905
],
906-
"artifactVersion": "1.8.0-rc01",
906+
"artifactVersion": "1.8.0",
907907
"description": "Provides BackHandler in Compose Multiplatform projects",
908908
"scm": {
909909
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -927,7 +927,7 @@
927927
"name": "Compose Multiplatform Team"
928928
}
929929
],
930-
"artifactVersion": "1.8.0-rc01",
930+
"artifactVersion": "1.8.0",
931931
"description": "Provides BackHandler in Compose Multiplatform projects",
932932
"scm": {
933933
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -951,7 +951,7 @@
951951
"name": "Compose Multiplatform Team"
952952
}
953953
],
954-
"artifactVersion": "1.8.0-rc01",
954+
"artifactVersion": "1.8.0",
955955
"description": "Compose classes related to dimensions without units",
956956
"scm": {
957957
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -975,7 +975,7 @@
975975
"name": "Compose Multiplatform Team"
976976
}
977977
],
978-
"artifactVersion": "1.8.0-rc01",
978+
"artifactVersion": "1.8.0",
979979
"description": "Compose classes related to dimensions without units",
980980
"scm": {
981981
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -999,7 +999,7 @@
999999
"name": "Compose Multiplatform Team"
10001000
}
10011001
],
1002-
"artifactVersion": "1.8.0-rc01",
1002+
"artifactVersion": "1.8.0",
10031003
"description": "Compose graphics",
10041004
"scm": {
10051005
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1023,7 +1023,7 @@
10231023
"name": "Compose Multiplatform Team"
10241024
}
10251025
],
1026-
"artifactVersion": "1.8.0-rc01",
1026+
"artifactVersion": "1.8.0",
10271027
"description": "Compose graphics",
10281028
"scm": {
10291029
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1047,7 +1047,7 @@
10471047
"name": "Compose Multiplatform Team"
10481048
}
10491049
],
1050-
"artifactVersion": "1.8.0-rc01",
1050+
"artifactVersion": "1.8.0",
10511051
"description": "Compose Text primitives and utilities",
10521052
"scm": {
10531053
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1071,7 +1071,7 @@
10711071
"name": "Compose Multiplatform Team"
10721072
}
10731073
],
1074-
"artifactVersion": "1.8.0-rc01",
1074+
"artifactVersion": "1.8.0",
10751075
"description": "Compose Text primitives and utilities",
10761076
"scm": {
10771077
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1095,7 +1095,7 @@
10951095
"name": "Compose Multiplatform Team"
10961096
}
10971097
],
1098-
"artifactVersion": "1.8.0-rc01",
1098+
"artifactVersion": "1.8.0",
10991099
"description": "Compose classes for simple units",
11001100
"scm": {
11011101
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1119,7 +1119,7 @@
11191119
"name": "Compose Multiplatform Team"
11201120
}
11211121
],
1122-
"artifactVersion": "1.8.0-rc01",
1122+
"artifactVersion": "1.8.0",
11231123
"description": "Compose classes for simple units",
11241124
"scm": {
11251125
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1143,7 +1143,7 @@
11431143
"name": "Compose Multiplatform Team"
11441144
}
11451145
],
1146-
"artifactVersion": "1.8.0-rc01",
1146+
"artifactVersion": "1.8.0",
11471147
"description": "Internal Compose utilities used by other modules",
11481148
"scm": {
11491149
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1167,7 +1167,7 @@
11671167
"name": "Compose Multiplatform Team"
11681168
}
11691169
],
1170-
"artifactVersion": "1.8.0-rc01",
1170+
"artifactVersion": "1.8.0",
11711171
"description": "Internal Compose utilities used by other modules",
11721172
"scm": {
11731173
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -1191,7 +1191,7 @@
11911191
"name": "Compose Multiplatform Team"
11921192
}
11931193
],
1194-
"artifactVersion": "1.8.0-rc01",
1194+
"artifactVersion": "1.8.0",
11951195
"description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.",
11961196
"scm": {
11971197
"connection": "scm:git:https://github.com/JetBrains/compose-jb.git",

‎app/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ dependencies {
125125
implementation(compose.components.resources)
126126
implementation(compose.materialIconsExtended)
127127

128-
implementation(libs.bundles.accompanist)
129-
130128
//used to generate the drawer on the left
131129
//https://github.com/mikepenz/MaterialDrawer
132130
implementation(libs.materialDrawer.core)

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GROUP=com.mikepenz
22

3-
VERSION_NAME=12.1.1
4-
VERSION_CODE=120101
3+
VERSION_NAME=12.1.2
4+
VERSION_CODE=120102
55

66
POM_URL=https://github.com/mikepenz/AboutLibraries
77
POM_SCM_URL=https://github.com/mikepenz/AboutLibraries

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ recyclerView = "1.4.0"
1313
# google
1414
material = "1.12.0"
1515
# other
16-
accompanist = "0.36.0"
1716
fastAdapter = "5.7.0"
1817
iconics = "5.4.0"
1918
itemAnimators = "1.1.0"
@@ -42,7 +41,6 @@ androidx-recyclerView = { module = "androidx.recyclerview:recyclerview", version
4241
# google
4342
google-material = { module = "com.google.android.material:material", version.ref = "material" }
4443
# other
45-
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
4644
fastAdapter-core = { module = "com.mikepenz:fastadapter", version.ref = "fastAdapter" }
4745
iconics-core = { module = "com.mikepenz:iconics-core", version.ref = "iconics" }
4846
itemAnimators-core = { module = "com.mikepenz:itemanimators", version.ref = "itemAnimators" }
@@ -52,9 +50,6 @@ materialDrawer-core = { module = "com.mikepenz:materialdrawer", version.ref = "m
5250
okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
5351

5452
[bundles]
55-
accompanist = [
56-
"accompanist-systemuicontroller",
57-
]
5853
androidx-lifecycle = [
5954
"androidx-lifecycle-livedata-ktx",
6055
"androidx-lifecycle-viewmodel-ktx",

‎gradle/wrapper/gradle-wrapper.jar‎

59 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)
⚡