Skip to content
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
2 changes: 2 additions & 0 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ jobs:
env:
multim_misskey_token: ${{secrets.multim_misskey_token}}
multim_misskey_instance: ${{secrets.multim_misskey_instance}}
USERNAME: ${{ github.actor }}
TOKEN: ${{ secrets.GITHUB_TOKEN }}
27 changes: 21 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ version = "1.0-SNAPSHOT"
allprojects {
repositories {
mavenCentral()
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/usbharu/kmp-logger")
credentials {
val props = Properties()
try {
props.load(file("${project.rootProject.projectDir}/local.properties").inputStream())
} catch (e:Exception){
println("local.properties not found")
}
username = props.getProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = props.getProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
}
}
}

Expand Down Expand Up @@ -78,7 +92,7 @@ subprojects {
"implementation"("io.ktor:ktor-client-logging:$ktor_version")
"implementation"("io.ktor:ktor-client-websockets:$ktor_version")
"implementation"("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
"implementation"("io.github.aakira:napier:2.6.1")
"implementation"("dev.usbharu:kmp-logger:1.1.0")
"implementation"("com.michael-bull.kotlin-result:kotlin-result:1.1.16")

"testImplementation"("org.junit.jupiter:junit-jupiter-api:5.9.0")
Expand All @@ -92,18 +106,19 @@ subprojects {
"implementation"("com.goncalossilva:murmurhash:0.4.0")
}

publishing{
repositories{
maven{
publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/usbharu/multim")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
username =
project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
}
}
publications{
publications {
register<MavenPublication>("gpr") {
groupId = project.group.toString()
artifactId = "multim-${project.name}"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/kotlin/dev/usbharu/multim/Logger.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dev.usbharu.multim

import dev.usbharu.logger.Napier
import dev.usbharu.multim.error.Error
import dev.usbharu.multim.error.ThrowableError
import io.github.aakira.napier.Napier

object Logger {

Expand Down