Skip to content

Commit 6bf7939

Browse files
BierDavluca992
andauthored
Fixing errors of PR 23 (#25)
* update .gitignore with gradle template * update to kotlin 1.6.21, bignum 0.3.4 and gradle 7.4.2 * use new memory model * add native targets requires pr: komputing/KHex#14 * Update KHex version Fix broken gradle.properties import Fix broken KHex import in build-src * Bump KHex version to 1.1.4 Bump KGP version to 1.8.21 Remove deprecated native targets Remove previously accidentally added line of code in build.gradle.kts Use macos as run target for all automations * Double workflow timout * Bump KHex version to expected version 1.1.5 * According to @Deprecation Annotation for legacy and IR compiler support (BOTH), switching to IR only Probably safe, because the user base for legacy is very limited Remove deprecated code, that shouldn't be necessary anymore due to the removal in the official JetBrains documentation * Update README.md * Remove --info attribute for less verbose CI outputs * Double workflow timeouts --------- Co-authored-by: Luca Spinazzola <mspinluca@gmail.com> Co-authored-by: David Bieregger <david@bieregger.at>
1 parent 26f9a6f commit 6bf7939

File tree

7 files changed

+46
-32
lines changed

7 files changed

+46
-32
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717

1818
jobs:
1919
build:
20-
timeout-minutes: 15
21-
runs-on: ubuntu-latest
20+
timeout-minutes: 60
21+
runs-on: macos-latest
2222

2323
steps:
2424
- name: Checkout the repo
@@ -47,7 +47,7 @@ jobs:
4747
run: chmod +x gradlew
4848

4949
- name: Build project and run tests with Gradle
50-
run: ./gradlew clean build --info
50+
run: ./gradlew clean build
5151

5252
- name: Bundle the failed build report
5353
if: failure()

.github/workflows/pr-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515

1616
jobs:
1717
build:
18-
timeout-minutes: 15
19-
runs-on: ubuntu-latest
18+
timeout-minutes: 60
19+
runs-on: macos-latest
2020

2121
steps:
2222
- name: Checkout the repo
@@ -45,7 +45,7 @@ jobs:
4545
run: chmod +x gradlew
4646

4747
- name: Build project and run tests
48-
run: ./gradlew clean build --info
48+
run: ./gradlew clean build
4949

5050
- name: Bundle the failed build report
5151
if: failure()

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212

1313
jobs:
1414
build:
15-
timeout-minutes: 15
16-
runs-on: ubuntu-latest
15+
timeout-minutes: 60
16+
runs-on: macos-latest
1717

1818
steps:
1919
- name: Checkout the repo
@@ -42,7 +42,7 @@ jobs:
4242
run: chmod +x gradlew
4343

4444
- name: Build project and run tests with Gradle
45-
run: ./gradlew clean build --info
45+
run: ./gradlew clean build
4646

4747
- name: Bundle the failed build report
4848
if: failure()

README.md

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
KHash is a Kotlin multiplatform library implementing common hashing functions.
66

7-
A part from that, it also provides some useful [extensions functions](https://kotlinlang.org/docs/reference/extensions.html).
7+
Apart from that, it also provides some useful [extensions functions](https://kotlinlang.org/docs/reference/extensions.html).
88

99
The implemented hashing functions are the following.
1010
* [RIPEMD160](https://en.wikipedia.org/wiki/RIPEMD)
@@ -19,8 +19,13 @@ The implemented hashing functions are the following.
1919

2020
This library is available through GitHub Packages.
2121

22-
![badge][badge-js]
22+
![badge][badge-android]
23+
![badge][badge-ios]
24+
![badge][badge-js-ir]
2325
![badge][badge-jvm]
26+
![badge][badge-linux]
27+
![badge][badge-mac]
28+
![badge][badge-apple-silicon]
2429

2530
In order to use it, first include the GitHub Packages maven repository inside your project `build.gradle.kts` file:
2631

@@ -36,22 +41,6 @@ repositories {
3641
}
3742
}
3843
```
39-
When 'username' could be anything and 'password' is an [encoded access token for public access](https://github.yungao-tech.community/t/download-from-github-package-registry-without-authentication/14407/44).
40-
41-
### JitPack (JVM only!)
42-
43-
This library is available on Jitpack. The current version is:
44-
45-
[![](https://jitpack.io/v/komputing/khash.svg)](https://jitpack.io/#komputing/khash)
46-
![badge][badge-jvm]
47-
48-
In order to use it, first include the Jitpack maven repository inside your project `build.gradle.kts` file:
49-
50-
```kotlin
51-
repositories {
52-
maven { url="https://jitpack.io" }
53-
}
54-
```
5544

5645
## Set it up
5746

@@ -144,5 +133,17 @@ Also this code is not hardened against side channel attacks. Keep this in mind w
144133
# License
145134
MIT
146135

147-
[badge-js]: http://img.shields.io/badge/platform-js-yellow.svg?style=flat
148-
[badge-jvm]: http://img.shields.io/badge/platform-jvm-orange.svg?style=flat
136+
[badge-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat
137+
[badge-android-native]: http://img.shields.io/badge/support-[AndroidNative]-6EDB8D.svg?style=flat
138+
[badge-jvm]: http://img.shields.io/badge/-jvm-DB413D.svg?style=flat
139+
[badge-js]: http://img.shields.io/badge/-js-F8DB5D.svg?style=flat
140+
[badge-js-ir]: http://img.shields.io/badge/-js--IR-F8DB5D.svg?style=flat
141+
[badge-nodejs]: https://img.shields.io/badge/-nodejs-68a063.svg?style=flat
142+
[badge-linux]: http://img.shields.io/badge/-linux-2D3F6C.svg?style=flat
143+
[badge-windows]: http://img.shields.io/badge/-windows-4D76CD.svg?style=flat
144+
[badge-wasm]: https://img.shields.io/badge/-wasm-624FE8.svg?style=flat
145+
[badge-apple-silicon]: http://img.shields.io/badge/support-[AppleSilicon]-43BBFF.svg?style=flat
146+
[badge-ios]: http://img.shields.io/badge/-ios-CDCDCD.svg?style=flat
147+
[badge-mac]: http://img.shields.io/badge/-macos-111111.svg?style=flat
148+
[badge-watchos]: http://img.shields.io/badge/-watchos-C0C0C0.svg?style=flat
149+
[badge-tvos]: http://img.shields.io/badge/-tvos-808080.svg?style=flat

buildSrc/build.gradle.kts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1+
import java.io.File
2+
import java.util.*
3+
14
plugins {
25
idea
36
`kotlin-dsl`
47
`kotlin-dsl-precompiled-script-plugins`
58
}
69

10+
val rootProperties = Properties().apply {
11+
load(File(projectDir, "../gradle.properties").inputStream())
12+
}
13+
714
repositories {
815
gradlePluginPortal()
916
}
@@ -16,6 +23,9 @@ idea {
1623
}
1724

1825
dependencies {
19-
implementation(kotlin("gradle-plugin", "${property("kgp")}"))
20-
implementation("com.github.ben-manes", "gradle-versions-plugin", "${property("plugin.com.github.ben-manes.versions")}")
26+
implementation(kotlin("gradle-plugin", rootProperties.getProperty("kgp")))
27+
implementation(
28+
"com.github.ben-manes", "gradle-versions-plugin",
29+
rootProperties.getProperty("plugin.com.github.ben-manes.versions")
30+
)
2131
}

buildSrc/gradle.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

buildSrc/src/main/kotlin/mpp-module.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("UNUSED_VARIABLE")
2+
13
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
24
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
35
import org.gradle.api.tasks.testing.logging.TestLogEvent
@@ -8,6 +10,7 @@ plugins {
810
id("maven-publish")
911
}
1012

13+
1114
val darwinTargets = arrayOf(
1215
"macosX64", "macosArm64",
1316
"iosArm64", "iosX64", "iosSimulatorArm64",
@@ -18,6 +21,7 @@ val linuxTargets = arrayOf("linuxX64", "linuxArm64")
1821
val mingwTargets = arrayOf("mingwX64")
1922
val nativeTargets = linuxTargets + darwinTargets + mingwTargets
2023

24+
2125
kotlin {
2226
explicitApi()
2327
targets {

0 commit comments

Comments
 (0)