Skip to content

Commit

Permalink
Merge pull request #172 from simple-robot/dev/main
Browse files Browse the repository at this point in the history
Release: v4.0.0-beta7
  • Loading branch information
ForteScarlet authored Jul 15, 2024
2 parents 43aff49 + d1e59f6 commit 46af212
Show file tree
Hide file tree
Showing 21 changed files with 626 additions and 115 deletions.
7 changes: 7 additions & 0 deletions .changelog/v4.0.0-beta7.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
> 对应核心版本: [**v4.1.0**](https://github.com/simple-robot/simpler-robot/releases/tag/v4.1.0)

我们欢迎并期望着您的的[反馈](https://github.com/simple-robot/simbot-component-qq-guild/issues)[协助](https://github.com/simple-robot/simbot-component-qq-guild/pulls)
感谢您的贡献与支持!

也欢迎您为我们献上一颗 `star`,这是对我们最大的鼓励与认可!
58 changes: 29 additions & 29 deletions .github/workflows/deploy-v4-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,32 +122,32 @@ jobs:
uses: actions/deploy-pages@v1

# https://www.jetbrains.com/help/writerside/configure-search.html
publish-indexes:
# Requires the build-job results
needs: [build, test]
runs-on: ubuntu-latest
container:
image: registry.jetbrains.team/p/writerside/builder/algolia-publisher:2.0.32-3

env:

CONFIG_JSON_VERSION: ${{ fromJSON(needs.build.outputs.config_json).productVersion }}

steps:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: algolia-indexes


- name: Unzip artifact
run: |
unzip -O UTF-8 -qq ${{ env.ALGOLIA_ARTIFACT }} -d algolia-indexes
env "algolia-key=${{secrets.ALGOLIA_KEY}}" java -jar /opt/builder/help-publication-agent.jar \
update-index \
--application-name ${{env.ALGOLIA_APP_NAME}} \
--index-name ${{env.ALGOLIA_INDEX_NAME}} \
--product ${{env.INSTANCE_NAME}} \
--version ${{env.CONFIG_JSON_VERSION}} \
--index-directory algolia-indexes/ \
2>&1 | tee algolia-update-index-log.txt
# publish-indexes:
# # Requires the build-job results
# needs: [build, test]
# runs-on: ubuntu-latest
# container:
# image: registry.jetbrains.team/p/writerside/builder/algolia-publisher:2.0.32-3
#
# env:
#
# CONFIG_JSON_VERSION: ${{ fromJSON(needs.build.outputs.config_json).productVersion }}
#
# steps:
# - name: Download artifact
# uses: actions/download-artifact@v3
# with:
# name: algolia-indexes
#
#
# - name: Unzip artifact
# run: |
# unzip -O UTF-8 -qq ${{ env.ALGOLIA_ARTIFACT }} -d algolia-indexes
# env "algolia-key=${{secrets.ALGOLIA_KEY}}" java -jar /opt/builder/help-publication-agent.jar \
# update-index \
# --application-name ${{env.ALGOLIA_APP_NAME}} \
# --index-name ${{env.ALGOLIA_INDEX_NAME}} \
# --product ${{env.INSTANCE_NAME}} \
# --version ${{env.CONFIG_JSON_VERSION}} \
# --index-directory algolia-indexes/ \
# 2>&1 | tee algolia-update-index-log.txt
6 changes: 3 additions & 3 deletions Writerside/cfg/buildprofiles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<locale-code>zh-CN</locale-code>
<noindex-content>false</noindex-content>
<analytics-head-script-file>head-script.html</analytics-head-script-file>
<algolia-id>VLLZ4JZE8Z</algolia-id>
<algolia-index>qg-doc</algolia-index>
<algolia-api-key>e60d9ee16618a0ad3a338ecc73cb840e</algolia-api-key>
<!-- <algolia-id>VLLZ4JZE8Z</algolia-id>-->
<!-- <algolia-index>qg-doc</algolia-index>-->
<!-- <algolia-api-key>e60d9ee16618a0ad3a338ecc73cb840e</algolia-api-key>-->
<web-root>http://component-qqguild.simbot.forte.love</web-root>
</variables>

Expand Down
5 changes: 4 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ apiValidation {
ignoredPackages.add("*.internal.*")

this.ignoredProjects.addAll(
listOf("api-reader")
listOf(
"api-reader",
"intents-processor"
),
)

// 实验性和内部API可能无法保证二进制兼容
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/P.kt
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ object P {
override val homepage: String get() = HOMEPAGE


const val VERSION = "4.0.0-beta6"
const val NEXT_VERSION = "4.0.0-beta7"
const val VERSION = "4.0.0-beta7"
const val NEXT_VERSION = "4.0.0-beta8"

override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
override val version = if (isSnapshot()) snapshotVersion else VERSION
Expand Down
1 change: 1 addition & 0 deletions internal-processors/intents-processor/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
用于将 `EventIntents` 的所有子实现类的intents进行聚合和整理
47 changes: 47 additions & 0 deletions internal-processors/intents-processor/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2024. ForteScarlet.
*
* This file is part of simbot-component-qq-guild.
*
* simbot-component-qq-guild is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Foundation,
* either version 3 of the License, or (at your option) any later version.
*
* simbot-component-qq-guild is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with simbot-component-qq-guild.
* If not, see <https://www.gnu.org/licenses/>.
*/

import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm")
}

repositories {
mavenCentral()
}

kotlin {
jvmToolchain(11)
compilerOptions {
javaParameters = true
jvmTarget.set(JvmTarget.JVM_11)
}
}

configJavaCompileWithModule()

dependencies {
api(libs.ksp)
api(libs.kotlinPoet.ksp)
testImplementation(kotlin("test-junit5"))
}

tasks.getByName<Test>("test") {
useJUnitPlatform()
}

Loading

0 comments on commit 46af212

Please sign in to comment.