Skip to content

Commit 53a620a

Browse files
committed
Merge remote-tracking branch 'origin/main_copy'
# Conflicts: # .github/workflows/publishToPages.yml
2 parents a99ee52 + d37c879 commit 53a620a

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

.github/workflows/buildAndPush.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
workflow_dispatch:
78

89
jobs:
910
infer-release:
@@ -57,6 +58,7 @@ jobs:
5758
build-and-publish:
5859
runs-on: macos-latest
5960
needs: infer-release
61+
environment: Maven
6062

6163
steps:
6264
- name: "✅ Checkout code"

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ alexzhirkevich/compose-cupertino (https://github.com/alexzhirkevich/compose-cupe
1212

1313
This software library was forked, and the original code has been modified.
1414
The library is being worked on at
15-
schott12521/compose-cupertino (https://github.com/schott12521/compose-cupertino).
15+
schott12521/compose-cupertino (https://github.com/kalist28/compose-cupertino).

README.md

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,34 @@
1-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.schott12521/cupertino/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.schott12521/cupertino)
1+
[![compose-mp-version](https://img.shields.io/badge/compose--multiplatform-1.8.2-blue)](https://github.com/JetBrains/compose-multiplatform)
2+
[![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-purple)](https://github.com/JetBrains/kotlin)
23

3-
[![Main Workflow](https://github.com/schott12521/compose-cupertino/actions/workflows/buildAndPush.yml/badge.svg)](https://github.com/schott12521/schott12521/compose-cupertino/actions/workflows/buildAndPush.yml)
4+
[![Main Workflow](https://github.com/kalist28/compose-cupertino/actions/workflows/buildAndPush.yml/badge.svg)](https://github.com/kalist28/compose-cupertino/actions/workflows/buildAndPush.yml)
45

56
# compose-cupertino
67

7-
This is a fork of [alexzhirkevich/compose-cupertino](https://github.com/alexzhirkevich/compose-cupertino) except its been updated to work with CMP 1.7+
8+
This is a fork of [schott12521/compose-cupertino](https://github.com/schott12521/compose-cupertino) a fork of [alexzhirkevich/compose-cupertino](https://github.com/alexzhirkevich/compose-cupertino) except its been updated to work with CMP 1.7+
89

910
Additionally this repo has automated builds to enable faster releases, to take advantage of new compose multiplatform features as they become available.
1011

11-
## New features (compared to the OG `compose-cupertino`)
12-
13-
- Updated SwipeBox
14-
- Fixed Cupertino Date Picker implementations to interact with scrolling correctly
15-
- Disable content scaling on CupertinoBottomSheetScaffold (https://github.com/alexzhirkevich/compose-cupertino/issues/80)
16-
- Using Dialogs instead of Popups for CupertinoDialogs (https://github.com/alexzhirkevich/compose-cupertino/issues/78)
17-
1812
# Usage
1913

20-
This package is published to Maven Central Repository: [cupertino-core on Maven Central](https://central.sonatype.com/artifact/io.github.schott12521/cupertino-core)
14+
This package is published to Maven Central Repository: [cupertino-core on Maven Central](https://central.sonatype.com/artifact/io.github.kalist28/cupertino-core)
2115

22-
Depend on the [latest version](https://github.com/schott12521/compose-cupertino/releases) by declaring this in libs.versions.toml:
16+
Depend on the [latest version](https://github.com/kalist28/compose-cupertino/releases) by declaring this in libs.versions.toml:
2317

18+
[![Maven Central](https://img.shields.io/maven-central/v/io.github.kalist28/cupertino)](https://maven-badges.herokuapp.com/maven-central/io.github.kalist28/cupertino)
2419
```
2520
cupertino = "$latestVersion"
2621
27-
cupertino = { group = "io.github.schott12521", name = "cupertino", version.ref = "cupertino" }
28-
cupertino-adaptive = { group = "io.github.schott12521", name = "cupertino-adaptive", version.ref = "cupertino" }
29-
cupertino-decompose = { group = "io.github.schott12521", name = "cupertino-decompose", version.ref = "cupertino" }
30-
cupertino-native = { group = "io.github.schott12521", name = "cupertino-native", version.ref = "cupertino" }
31-
cupertino-icons-extended = { group = "io.github.schott12521", name = "cupertino-icons-extended", version.ref = "cupertino" }
22+
cupertino = { group = "io.github.kalist28", name = "cupertino", version.ref = "cupertino" }
23+
cupertino-adaptive = { group = "io.github.kalist28", name = "cupertino-adaptive", version.ref = "cupertino" }
24+
cupertino-decompose = { group = "io.github.kalist28", name = "cupertino-decompose", version.ref = "cupertino" }
25+
cupertino-native = { group = "io.github.kalist28", name = "cupertino-native", version.ref = "cupertino" }
26+
cupertino-icons-extended = { group = "io.github.kalist28", name = "cupertino-icons-extended", version.ref = "cupertino" }
3227
```
3328

34-
This package is also available via GitHub packages.
35-
3629
## Try it
3730

38-
Wanna see what the library feels like? The latest version builds and deploys the Kotlin/WasmJS target to github pages: https://schott12521.github.io/compose-cupertino/
31+
Wanna see what the library feels like? The latest version builds and deploys the Kotlin/WasmJS target to github pages: https://kalist28.github.io/compose-cupertino/
3932

4033
# License
4134

@@ -71,3 +64,7 @@ Ideally you set up Android Studio / IDE to handle copyright notices for you: htt
7164
# Disclaimer
7265

7366
Note this repo is not officially supported in any capacity; changes will be applied upstream when applicable ([example1](https://github.com/alexzhirkevich/compose-cupertino/pull/74), [example2](https://github.com/alexzhirkevich/compose-cupertino/pull/77))
67+
68+
# *P.S
69+
70+
Thanks to [schott12521](https://github.com/schott12521) for fix original fork and automated builds.

buildSrc/src/main/kotlin/publishing-convention.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ mavenPublishing {
5656
)
5757
)
5858

59-
if (isGithubActions)
59+
if (isGithubActions)
6060
signAllPublications()
6161

6262
pom {
6363
name.set(project.name)
6464
description.set(publishProperties.getProperty("description"))
65-
url.set("https://github.com/schott12521/compose-cupertino")
65+
url.set("https://github.com/kalist28/compose-cupertino")
6666

6767
licenses {
6868
license {
@@ -81,11 +81,16 @@ mavenPublishing {
8181
name.set("Scott Lanoue")
8282
email.set("schott12521@gmail.com")
8383
}
84+
developer {
85+
id.set("kalist28")
86+
name.set("Dmitry Kalistratov")
87+
email.set("kalistratov.d.m@gmail.com")
88+
}
8489
}
8590
scm {
86-
connection.set("scm:git:https://github.com/schott12521/compose-cupertino.git")
87-
developerConnection.set("scm:git:ssh://github.com/schott12521/compose-cupertino.git")
88-
url.set("https://github.com/schott12521/compose-cupertino")
91+
connection.set("scm:git:https://github.com/kalist28/compose-cupertino.git")
92+
developerConnection.set("scm:git:ssh://github.com/kalist28/compose-cupertino.git")
93+
url.set("https://github.com/kalist28/compose-cupertino")
8994
}
9095
}
9196
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
group=io.github.schott12521
18+
group=io.github.kalist28
1919

2020
#Gradle
2121
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"

0 commit comments

Comments
 (0)