Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates #106

Merged
merged 19 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17.0.10+7'
java-version: '17.0.13+11'
- name: Select XCode 15.2
run: |
sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
chmod +x ./gradlew
./gradlew build test koverXmlReport detekt sonar assembleXCFramework --parallel
./gradlew build test koverXmlReport detekt sonar assembleXCFramework -x jsBrowserTest -x jsNodeTest -x wasmJsBrowserTest -x wasmJsNodeTest --parallel
- name: Set RELEASE_VERSION variable
run: |
echo "RELEASE_VERSION=$(cat build/version.txt)" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '18.0.2+9'
java-version: '17.0.13+11'
- name: Gradle Cache
uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .idea/runConfigurations/Build___Test.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ of Ashampoo Photo Organizer, which, in turn, is driven by user community feedbac
## Installation

```
implementation("com.ashampoo:kim:0.20")
implementation("com.ashampoo:kim:0.20.1")
```

For the targets `wasmJs` & `js` you also need to specify this:
Expand Down
40 changes: 35 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework

plugins {
kotlin("multiplatform") version "2.0.20"
kotlin("multiplatform") version "2.0.21"
id("com.android.library") version "8.5.0"
id("maven-publish")
id("signing")
Expand All @@ -24,10 +24,10 @@ repositories {

val productName: String = "Ashampoo Kim"

val ktorVersion: String = "3.0.0"
val ktorVersion: String = "3.0.1"
val xmpCoreVersion: String = "1.4.2"
val dateTimeVersion: String = "0.6.1"
val kotlinxIoVersion: String = "0.5.4"
val kotlinxIoVersion: String = "0.6.0"

description = productName
group = "com.ashampoo"
Expand Down Expand Up @@ -169,10 +169,40 @@ kotlin {
}
}

js()
js(IR) {

moduleName = "kim"

browser {
webpackTask {
mainOutputFileName = "kim.js"
output.library = "kimlib"
}
}

nodejs()

binaries.library()
// binaries.executable()

compilations.all {
compileTaskProvider.configure {
compilerOptions.freeCompilerArgs.add("-Xir-minimized-member-names=false")
}
}
}

@OptIn(ExperimentalWasmDsl::class)
wasmJs()
wasmJs {

moduleName = "kim-wasm"

browser()
nodejs()

binaries.library()
// binaries.executable()
}

// WASI support is planned for kotlinx-datetime v0.7
// @OptIn(ExperimentalWasmDsl::class)
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
android.useAndroidX=true
kotlin.code.style=official
kotlin.js.ir.output.granularity=whole-program
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.mpp.enableCInteropCommonization=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading