Skip to content

Commit 4be2f1c

Browse files
committed
Merge branch 'master' into feature/kotlin-2.0.0
2 parents 27d79dd + f18dcd2 commit 4be2f1c

104 files changed

Lines changed: 1299 additions & 1197 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/release-kotlin.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ on:
88
- 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta[0-9]+'
99
- 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC'
1010
- 'v[0-9]+.[0-9]+.[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC[0-9]+'
11+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+'
12+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+'
13+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta'
14+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta[0-9]+'
15+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC'
16+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-RC[0-9]+'
1117
- 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+'
1218
- 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+'
1319
- 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+-kotlin-[0-9]+.[0-9]+.[0-9]+-Beta'
@@ -26,7 +32,7 @@ jobs:
2632
uses: actions/setup-java@v4
2733
with:
2834
distribution: 'zulu'
29-
java-version: '11'
35+
java-version: '17'
3036
- name: Setup Gradle
3137
uses: gradle/actions/setup-gradle@v3
3238
- name: Cache Konan

.github/workflows/release-swift.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
tags:
55
- 'v[0-9]+.[0-9]+.[0-9]+'
6+
- 'v[0-9]+.[0-9]+.[0-9]+-BETA-[0-9]+'
67
- 'v[0-9]+.[0-9]+.[0-9]+-ALPHA-[0-9]+'
78
jobs:
89
publish-cocoapods-libraries:
@@ -14,15 +15,15 @@ jobs:
1415
uses: maxim-lobanov/setup-xcode@v1
1516
with:
1617
xcode-version: '15.0'
17-
- name: Publish KMMViewModelCoreObjC
18-
run: pod trunk push KMMViewModelCoreObjC.podspec --synchronous
18+
- name: Publish KMPObservableViewModelCoreObjC
19+
run: pod trunk push KMPObservableViewModelCoreObjC.podspec --synchronous
1920
env:
2021
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
21-
- name: Publish KMMViewModelCore
22-
run: pod trunk push KMMViewModelCore.podspec --synchronous
22+
- name: Publish KMPObservableViewModelCore
23+
run: pod trunk push KMPObservableViewModelCore.podspec --synchronous
2324
env:
2425
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
25-
- name: Publish KMMViewModelSwiftUI
26-
run: pod trunk push KMMViewModelSwiftUI.podspec --synchronous
26+
- name: Publish KMPObservableViewModelSwiftUI
27+
run: pod trunk push KMPObservableViewModelSwiftUI.podspec --synchronous
2728
env:
2829
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

KMMViewModelCore/ChildViewModels.swift

Lines changed: 0 additions & 311 deletions
This file was deleted.

KMMViewModelCore/KMMViewModel.swift

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)