mirror of
https://github.com/LamGC/ScalaBot.git
synced 2025-07-03 05:47:24 +00:00
Compare commits
9 Commits
cf9753897b
...
v0.8.0-1
Author | SHA1 | Date | |
---|---|---|---|
818cb21df7
|
|||
c681ebc4c1
|
|||
44b7b5122f
|
|||
bf4adc8437
|
|||
47d34b0fd8 | |||
14098d285c | |||
ad359935d6 | |||
3e1bf4991d
|
|||
bd7f556c31
|
2
.github/workflows/publish-artifacts.yml
vendored
2
.github/workflows/publish-artifacts.yml
vendored
@ -36,7 +36,7 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push container image
|
- name: Build and push container image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
@ -36,7 +36,7 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push container image
|
- name: Build and push container image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.9.23" apply false
|
kotlin("jvm") version "2.1.0" apply false
|
||||||
id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
|
id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
|
||||||
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
|
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
|
||||||
}
|
}
|
||||||
@ -13,5 +13,5 @@ allprojects {
|
|||||||
|
|
||||||
}
|
}
|
||||||
group = "net.lamgc"
|
group = "net.lamgc"
|
||||||
version = "0.7.0"
|
version = "0.8.0-1"
|
||||||
}
|
}
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
10
gradlew
vendored
10
gradlew
vendored
@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright ? 2015-2021 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@ -32,10 +32,10 @@
|
|||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
# * functions;
|
# * functions;
|
||||||
# * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
# ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
# * compound commands having a testable exit status, especially ?case?;
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
# * various built-in commands including ?command?, ?set?, and ?ulimit?.
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
#
|
#
|
||||||
# Important for patching:
|
# Important for patching:
|
||||||
#
|
#
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
@ -24,8 +25,8 @@ dependencies {
|
|||||||
implementation("org.apache.maven:maven-aether-provider:3.3.9")
|
implementation("org.apache.maven:maven-aether-provider:3.3.9")
|
||||||
implementation("org.codehaus.plexus:plexus-utils:3.5.1")
|
implementation("org.codehaus.plexus:plexus-utils:3.5.1")
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
|
implementation("org.jetbrains.kotlin:kotlin-reflect:2.1.0")
|
||||||
implementation("com.google.code.gson:gson:2.10.1")
|
implementation("com.google.code.gson:gson:2.10.1")
|
||||||
|
|
||||||
implementation("org.jdom:jdom2:2.0.6.1")
|
implementation("org.jdom:jdom2:2.0.6.1")
|
||||||
@ -38,17 +39,19 @@ dependencies {
|
|||||||
implementation("io.prometheus:simpleclient_httpserver:0.16.0")
|
implementation("io.prometheus:simpleclient_httpserver:0.16.0")
|
||||||
|
|
||||||
testImplementation(kotlin("test"))
|
testImplementation(kotlin("test"))
|
||||||
testImplementation("io.mockk:mockk:1.13.9")
|
testImplementation("io.mockk:mockk:1.13.13")
|
||||||
testImplementation("com.github.stefanbirkner:system-lambda:1.2.1")
|
testImplementation("com.github.stefanbirkner:system-lambda:1.2.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.test {
|
tasks.test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
|
jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<KotlinCompile> {
|
tasks.withType<KotlinCompile> {
|
||||||
kotlinOptions.jvmTarget = "17"
|
compilerOptions {
|
||||||
|
jvmTarget = JvmTarget.JVM_17
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
|
@ -51,17 +51,6 @@ publishing {
|
|||||||
password = project.properties["repo.credentials.self-git.password"].toString()
|
password = project.properties["repo.credentials.self-git.password"].toString()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val kukuRepoUrl = if (project.version.toString().endsWith("-SNAPSHOT", ignoreCase = true)) {
|
|
||||||
"https://nexus.kuku.me/repository/maven-snapshots/"
|
|
||||||
} else {
|
|
||||||
"https://nexus.kuku.me/repository/maven-releases/"
|
|
||||||
}
|
|
||||||
maven(kukuRepoUrl) {
|
|
||||||
credentials {
|
|
||||||
username = project.properties["repo.credentials.kuku-repo.username"].toString()
|
|
||||||
password = project.properties["repo.credentials.kuku-repo.password"].toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
publications {
|
publications {
|
||||||
|
@ -13,6 +13,12 @@ public class BotExtensionCreateOptions {
|
|||||||
private final long botAccountId;
|
private final long botAccountId;
|
||||||
private final ProxyConfig proxy;
|
private final ProxyConfig proxy;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 构造新的 BotExtensionCreateOptions.
|
||||||
|
*
|
||||||
|
* @param botAccountId 创建扩展的 Bot 账户 Id.
|
||||||
|
* @param proxy Bot 所使用的代理配置.
|
||||||
|
*/
|
||||||
public BotExtensionCreateOptions(long botAccountId, ProxyConfig proxy) {
|
public BotExtensionCreateOptions(long botAccountId, ProxyConfig proxy) {
|
||||||
this.botAccountId = botAccountId;
|
this.botAccountId = botAccountId;
|
||||||
this.proxy = proxy;
|
this.proxy = proxy;
|
||||||
|
@ -4,6 +4,9 @@ import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 一些开发扩展中可以用到的工具类.
|
||||||
|
*/
|
||||||
public final class AbilityBots {
|
public final class AbilityBots {
|
||||||
|
|
||||||
private AbilityBots() {
|
private AbilityBots() {
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("org.jetbrains.kotlinx.kover")
|
id("org.jetbrains.kotlinx.kover")
|
||||||
@ -17,7 +19,7 @@ dependencies {
|
|||||||
api("com.google.code.gson:gson:2.10.1")
|
api("com.google.code.gson:gson:2.10.1")
|
||||||
|
|
||||||
testImplementation(kotlin("test"))
|
testImplementation(kotlin("test"))
|
||||||
testImplementation("io.mockk:mockk:1.13.9")
|
testImplementation("io.mockk:mockk:1.13.13")
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
|
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
|
||||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
|
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
|
||||||
|
|
||||||
@ -25,8 +27,8 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
|
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
|
||||||
kotlinOptions {
|
compilerOptions {
|
||||||
jvmTarget = "17"
|
jvmTarget = JvmTarget.JVM_17
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,17 +60,6 @@ publishing {
|
|||||||
password = project.properties["repo.credentials.self-git.password"].toString()
|
password = project.properties["repo.credentials.self-git.password"].toString()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val kukuRepoUrl = if (project.version.toString().endsWith("-SNAPSHOT", ignoreCase = true)) {
|
|
||||||
"https://nexus.kuku.me/repository/maven-snapshots/"
|
|
||||||
} else {
|
|
||||||
"https://nexus.kuku.me/repository/maven-releases/"
|
|
||||||
}
|
|
||||||
maven(kukuRepoUrl) {
|
|
||||||
credentials {
|
|
||||||
username = project.properties["repo.credentials.kuku-repo.username"].toString()
|
|
||||||
password = project.properties["repo.credentials.kuku-repo.password"].toString()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
publications {
|
publications {
|
||||||
|
Reference in New Issue
Block a user