Skip to content

Commit 65ad8a6

Browse files
kpgalligankpgalligan
authored
Merge pull request #13 from touchlab/kpg/update_1920
Kpg/update 1920
2 parents 82e64fe + 20d76db commit 65ad8a6

File tree

13 files changed

+119
-123
lines changed

13 files changed

+119
-123
lines changed

‎.github/workflows/deploy.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: deploy
2+
on: workflow_dispatch
3+
4+
jobs:
5+
deploy:
6+
runs-on: macos-latest
7+
steps:
8+
- name: Checkout the repo
9+
uses: actions/checkout@v3
10+
11+
- uses: actions/setup-java@v2
12+
with:
13+
distribution: "adopt"
14+
java-version: "17"
15+
- name: Validate Gradle Wrapper
16+
uses: gradle/wrapper-validation-action@v1
17+
- name: Cache gradle
18+
uses: actions/cache@v2
19+
with:
20+
path: ~/.gradle/caches
21+
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
22+
restore-keys: |
23+
${{ runner.os }}-gradle-
24+
25+
- name: Publish Artifacts
26+
run: ./gradlew publish --no-daemon --stacktrace --no-build-cache
27+
env:
28+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
29+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
30+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
31+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
32+
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
33+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
34+
35+
env:
36+
GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

‎.github/workflows/release.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: release
2+
on: workflow_dispatch
3+
4+
jobs:
5+
release:
6+
runs-on: macos-latest
7+
steps:
8+
- name: Checkout the repo
9+
uses: actions/checkout@v3
10+
11+
- uses: touchlab/[email protected]
12+
id: version-name
13+
with:
14+
file: ./gradle.properties
15+
property: CKLIB_VERSION
16+
17+
- name: Echo Version
18+
run: echo "${{ steps.version-name.outputs.propVal }}"
19+
20+
- uses: actions/setup-java@v2
21+
with:
22+
distribution: "adopt"
23+
java-version: "17"
24+
- name: Validate Gradle Wrapper
25+
uses: gradle/wrapper-validation-action@v1
26+
- name: Cache gradle
27+
uses: actions/cache@v2
28+
with:
29+
path: ~/.gradle/caches
30+
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
31+
restore-keys: |
32+
${{ runner.os }}-gradle-
33+
34+
- name: Finish Maven Central Release
35+
run: ./gradlew closeAndReleaseRepository --no-daemon --stacktrace --no-build-cache
36+
env:
37+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
38+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
39+
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
40+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
41+
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
42+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
43+
44+
- name: Create Release
45+
if: ${{ contains(steps.version-match.outputs.group1, 'SNAPSHOT') == false }}
46+
uses: touchlab/[email protected]
47+
with:
48+
tag: ${{ steps.version-name.outputs.propVal }}
49+
50+
env:
51+
GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

‎.idea/compiler.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.

‎.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.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.

‎OLDREADME.md

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

‎build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@
1313

1414
buildscript {
1515
extra["kotlin_plugin_id"] = "co.touchlab.cklib"
16-
dependencies {
17-
classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
18-
}
1916
}
2017

2118
plugins {
22-
id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
19+
20+
id("com.github.gmazzo.buildconfig") version "4.1.2" apply false
21+
id("com.vanniktech.maven.publish") version "0.25.3" apply false
22+
alias(libs.plugins.kotlin.jvm) apply false
2323
}
2424

2525
val GROUP: String by project
26+
2627
val CKLIB_VERSION: String by project
2728

2829
allprojects {

‎gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ android.useAndroidX=true
1414
org.gradle.jvmargs=-Xmx2g
1515

1616
GROUP=co.touchlab
17-
KOTLIN_VERSION=1.6.0
18-
CKLIB_VERSION=0.2.4
17+
CKLIB_VERSION=0.3.0
1918

2019
POM_NAME=CKlib
2120
POM_DESCRIPTION=C/C++ Bitcode Into Klib

‎gradle/libs.versions.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[versions]
2+
kotlin = "1.9.20"
3+
4+
[libraries]
5+
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
6+
7+
[plugins]
8+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎plugin/build.gradle.kts

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@ plugins {
77
id("com.vanniktech.maven.publish")
88
}
99

10-
java {
11-
sourceCompatibility = JavaVersion.VERSION_1_8
12-
targetCompatibility = JavaVersion.VERSION_1_8
10+
kotlin {
11+
jvmToolchain(11)
1312
}
1413

15-
val KOTLIN_VERSION: String by project
16-
1714
dependencies {
1815
implementation(gradleApi())
19-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION")
20-
implementation("org.rauschig:jarchivelib:1.2.0")
21-
implementation(kotlin("stdlib-jdk8"))
16+
implementation(libs.kotlin.gradle.plugin)
17+
implementation(kotlin("stdlib"))
2218
}
2319

2420
buildConfig {
@@ -41,12 +37,4 @@ gradlePlugin {
4137
}
4238
repositories {
4339
mavenCentral()
44-
}
45-
val compileKotlin: KotlinCompile by tasks
46-
compileKotlin.kotlinOptions {
47-
jvmTarget = "1.8"
48-
}
49-
val compileTestKotlin: KotlinCompile by tasks
50-
compileTestKotlin.kotlinOptions {
51-
jvmTarget = "1.8"
5240
}

‎plugin/src/main/kotlin/GradleValues.kt

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

‎plugin/src/main/kotlin/co/touchlab/cklib/gradle/CKlibGradleExtension.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ internal val llvmName: String
9191
}
9292
}
9393

94-
//https://download.jetbrains.com/kotlin/native/clang-llvm-8.0.0-linux-x86-64.tar.gz
95-
internal val llvm_linux_x64 = "clang-llvm-8.0.0-linux-x86-64"
96-
internal val llvm_mingw_x64 = "msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1"
97-
internal val llvm_macos_x64 = "clang-llvm-apple-8.0.0-darwin-macos"
98-
internal val llvm_macos_arm64 = "clang-llvm-apple-8.0.0-darwin-macos-aarch64"
94+
//https://download.jetbrains.com/kotlin/native/apple-llvm-20200714-macos-aarch64-1.tar.gz
95+
internal val llvm_linux_x64 = "llvm-11.1.0-linux-x64-2"
96+
internal val llvm_mingw_x64 = "llvm-11.1.0-windows-x64-2"
97+
internal val llvm_macos_x64 = "apple-llvm-20200714-macos-x64-1"
98+
internal val llvm_macos_arm64 = "apple-llvm-20200714-macos-aarch64-1"

0 commit comments

Comments
 (0)