Skip to content

Commit 83a44b2

Browse files
committed
Merge branch 'master' into feature/observable
2 parents 40c3275 + 499a6ac commit 83a44b2

File tree

124 files changed

+1991
-1703
lines changed

Some content is hidden

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

124 files changed

+1991
-1703
lines changed

.github/workflows/code-quality.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Qodana
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- master
7+
jobs:
8+
qodana:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
checks: write
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
with:
18+
ref: ${{ github.event.pull_request.head.sha }}
19+
fetch-depth: 0
20+
- id: get-java-home-11
21+
run: echo "JAVA_HOME_11_X64=$JAVA_HOME_11_X64" >> $GITHUB_OUTPUT
22+
- name: 'Qodana Scan'
23+
uses: JetBrains/qodana-action@v2024.1
24+
with:
25+
args: -v,${{ steps.get-java-home-11.outputs.JAVA_HOME_11_X64 }}:/root/.jdks/jdk11
26+
post-pr-comment: false
27+
env:
28+
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.github/workflows/release-kotlin.yaml

Lines changed: 15 additions & 11 deletions
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'
@@ -20,22 +26,20 @@ jobs:
2026
steps:
2127
- name: Checkout
2228
uses: actions/checkout@v4
23-
- name: Gradle Wrapper Validation
24-
uses: gradle/wrapper-validation-action@v2
2529
- name: Setup JDK
2630
uses: actions/setup-java@v4
2731
with:
2832
distribution: 'zulu'
29-
java-version: '11'
33+
java-version: '17'
3034
- name: Setup Gradle
31-
uses: gradle/actions/setup-gradle@v3
35+
uses: gradle/actions/setup-gradle@v4
3236
- name: Cache Konan
3337
uses: ./.github/actions/cache-konan
34-
- name: Publish to Sonatype
35-
run: ./gradlew publishAllPublicationsToSonatypeRepository
38+
- name: Publish to Maven Central
39+
run: ./gradlew publishToMavenCentral
3640
env:
37-
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
38-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
39-
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
40-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
41-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
41+
ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
42+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
43+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_SECRET_KEY }}
44+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
45+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}

.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 }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.kotlin/
12
local.properties
23

34
# Created by https://www.toptal.com/developers/gitignore/api/swift,xcode,gradle,kotlin,intellij

.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.

.idea/kotlinc.xml

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

0 commit comments

Comments
 (0)