mirror of
https://github.com/LamGC/ScalaBot.git
synced 2025-07-02 05:17:24 +00:00
Compare commits
3 Commits
change-def
...
add-compat
Author | SHA1 | Date | |
---|---|---|---|
a65a57f9e2
|
|||
19cc1b9358
|
|||
ff396425a7
|
26
.github/workflows/build-and-test.yml
vendored
26
.github/workflows/build-and-test.yml
vendored
@ -13,7 +13,7 @@ permissions:
|
|||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build-and-test:
|
||||||
timeout-minutes: 8
|
timeout-minutes: 8
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
@ -32,3 +32,27 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
gradle-version: 'wrapper'
|
gradle-version: 'wrapper'
|
||||||
arguments: test
|
arguments: test
|
||||||
|
compatibility-check:
|
||||||
|
timeout-minutes: 30
|
||||||
|
continue-on-error: true
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os: [ ubuntu-latest ]
|
||||||
|
java-version: [ 11, 12, 13, 14, 15, 16, 17, 18 ]
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- name: Set up JDK
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
java-version: ${{ matrix.java-version }}
|
||||||
|
distribution: 'adopt-hotspot'
|
||||||
|
cache: 'gradle'
|
||||||
|
- name: Grant execute permission for gradlew
|
||||||
|
run: chmod +x gradlew
|
||||||
|
- name: Build and test
|
||||||
|
uses: gradle/gradle-build-action@v2.2.1
|
||||||
|
with:
|
||||||
|
gradle-version: 'wrapper'
|
||||||
|
arguments: test
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package net.lamgc.scalabot
|
package net.lamgc.scalabot
|
||||||
|
|
||||||
import ch.qos.logback.core.PropertyDefinerBase
|
import ch.qos.logback.core.PropertyDefinerBase
|
||||||
import com.google.common.net.InternetDomainName
|
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
import com.google.gson.JsonArray
|
import com.google.gson.JsonArray
|
||||||
@ -16,9 +15,9 @@ import org.eclipse.aether.repository.RepositoryPolicy
|
|||||||
import org.telegram.telegrambots.bots.DefaultBotOptions
|
import org.telegram.telegrambots.bots.DefaultBotOptions
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
import java.net.URLEncoder
|
|
||||||
import java.nio.charset.StandardCharsets
|
import java.nio.charset.StandardCharsets
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger
|
||||||
import java.util.function.Supplier
|
import java.util.function.Supplier
|
||||||
import kotlin.reflect.KProperty
|
import kotlin.reflect.KProperty
|
||||||
|
|
||||||
@ -45,7 +44,7 @@ internal fun ProxyConfig.toAetherProxy(): Proxy? {
|
|||||||
|
|
||||||
internal fun MavenRepositoryConfig.toRemoteRepository(proxyConfig: ProxyConfig? = null): RemoteRepository {
|
internal fun MavenRepositoryConfig.toRemoteRepository(proxyConfig: ProxyConfig? = null): RemoteRepository {
|
||||||
val repositoryId = if (id == null) {
|
val repositoryId = if (id == null) {
|
||||||
val generatedRepoId = createDefaultRepositoryId(url)
|
val generatedRepoId = createDefaultRepositoryId()
|
||||||
log.debug { "仓库 Url `$url` 未设置仓库 Id, 已分配缺省 Id: $generatedRepoId" }
|
log.debug { "仓库 Url `$url` 未设置仓库 Id, 已分配缺省 Id: $generatedRepoId" }
|
||||||
generatedRepoId
|
generatedRepoId
|
||||||
} else {
|
} else {
|
||||||
@ -93,11 +92,10 @@ private fun checkRepositoryLayout(layoutType: String): String {
|
|||||||
return type
|
return type
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun createDefaultRepositoryId(url: URL): String {
|
private val repoNumberGenerator = AtomicInteger(1)
|
||||||
val topPrivateDomain = InternetDomainName.from(url.host).topPrivateDomain().toString()
|
|
||||||
return "Repository-${URLEncoder.encode(topPrivateDomain, StandardCharsets.UTF_8)}-${
|
private fun createDefaultRepositoryId(): String {
|
||||||
url.toString().hashCode().toString(16)
|
return "Repository-${repoNumberGenerator.getAndIncrement()}"
|
||||||
}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user