From e5560c885d373ac4d4a30f7da56bd1b607eda846 Mon Sep 17 00:00:00 2001 From: Fiona Date: Fri, 9 Jan 2026 11:52:09 +0800 Subject: [PATCH] Feat/change upload domain (#3) * feat: update upload domain * feat: update upload domain * feat: change version --- CHANGELOG.md | 8 +++++++- FORK_NOTICE.md | 10 ++++------ README.md | 12 ++++++------ .../com/datadog/gradle/config/MavenConfig.kt | 4 ++-- .../com/datadog/gradle/plugin/FlashcatSite.kt | 8 ++++---- ...277\253\351\200\237\345\274\200\345\247\213.md" | 14 +++++++------- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17876c16..e8af069b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.1.0 / 2026-01-09 (Flashcat Release) + +### breaking change + +Change upload domain. + # 1.0.0 / 2025-12-04 (Flashcat Release) **First Flashcat Release** @@ -23,7 +29,7 @@ This is the first official release forked from Datadog dd-sdk-android-gradle-plu - CI configuration file keeps `datadog-ci.json` name but uses `flashcatSite` field - Environment variable priority: `FC_API_KEY` > `FLASHCAT_API_KEY` > `DD_API_KEY` > `DATADOG_API_KEY` -- Site configuration: `CN` (browser.flashcat.cloud) and `STAGING` (jira.flashcat.cloud) +- Site configuration: `CN` (ci.flashcat.cloud) and `STAGING` (ci-dev.flashcat.cloud) ### Links diff --git a/FORK_NOTICE.md b/FORK_NOTICE.md index cd0ee181..f891ea80 100644 --- a/FORK_NOTICE.md +++ b/FORK_NOTICE.md @@ -20,8 +20,8 @@ This fork has been modified by **Flashcat, Inc.** to integrate with the Flashcat 1. **Rebranding**: Changed from Datadog to Flashcat branding 2. **Site Endpoints**: Updated to use Flashcat service endpoints - - `browser.flashcat.cloud` (CN site) - - `jira.flashcat.cloud` (STAGING site) + - `ci.flashcat.cloud` (CN site) + - `ci-dev.flashcat.cloud` (STAGING site) 3. **Configuration**: Modified extension name from `datadog {}` to `flashcat {}` 4. **API Keys**: Updated environment variables to `FC_API_KEY` / `FLASHCAT_API_KEY` 5. **CI Configuration**: Changed JSON field from `datadogSite` to `flashcatSite` @@ -58,8 +58,8 @@ We acknowledge and thank **Datadog, Inc.** for their excellent work on the origi 1. **品牌重命名**: 从 Datadog 改为 Flashcat 品牌 2. **服务端点**: 更新为使用 Flashcat 服务端点 - - `browser.flashcat.cloud` (CN 站点) - - `jira.flashcat.cloud` (STAGING 站点) + - `ci.flashcat.cloud` (CN 站点) + - `ci-dev.flashcat.cloud` (STAGING 站点) 3. **配置方式**: Extension 名称从 `datadog {}` 改为 `flashcat {}` 4. **API 密钥**: 环境变量更新为 `FC_API_KEY` / `FLASHCAT_API_KEY` 5. **CI 配置**: JSON 字段从 `datadogSite` 改为 `flashcatSite` @@ -90,5 +90,3 @@ See [LICENSE](LICENSE) file for the full license text. See [NOTICE](NOTICE) file for attribution details. 归属详情请查看 [NOTICE](NOTICE) 文件。 - - diff --git a/README.md b/README.md index c60105ee..a7e24161 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Add the following line to your `build.gradle` file. ```groovy plugins { - id("cloud.flashcat.android-gradle-plugin") version "1.0.0" + id("cloud.flashcat.android-gradle-plugin") version "1.1.0" } ``` @@ -32,7 +32,7 @@ plugins { ```kotlin plugins { - id("cloud.flashcat.android-gradle-plugin") version "1.0.0" + id("cloud.flashcat.android-gradle-plugin") version "1.1.0" } ``` @@ -120,7 +120,7 @@ export FC_API_KEY="your-flashcat-api-key" export FLASHCAT_API_KEY="your-flashcat-api-key" # Site (optional) -export FLASHCAT_SITE="browser.flashcat.cloud" +export FLASHCAT_SITE="ci.flashcat.cloud" ``` ### Configuration File (flashcat-ci.json) @@ -130,7 +130,7 @@ You can also use a `flashcat-ci.json` file in your project root for configuratio ```json { "apiKey": "your-flashcat-api-key", - "flashcatSite": "browser.flashcat.cloud" + "flashcatSite": "ci.flashcat.cloud" } ``` @@ -140,8 +140,8 @@ You can also use a `flashcat-ci.json` file in your project root for configuratio The plugin supports the following Flashcat sites: -- **CN**: `browser.flashcat.cloud` (default) -- **STAGING**: `jira.flashcat.cloud` (internal usage only) +- **CN**: `ci.flashcat.cloud` (default) +- **STAGING**: `ci-dev.flashcat.cloud` (internal usage only) --- diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt index e6734a14..c78eeca8 100644 --- a/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt +++ b/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt @@ -38,11 +38,11 @@ object MavenConfig { } // publish branch → Snapshot refName == "publish" -> { - Version(1, 0, 0, Version.Type.Snapshot) + Version(1, 1, 0, Version.Type.Snapshot) } // Local development or other branches else -> { - Version(1, 0, 0, Version.Type.Release) + Version(1, 1, 0, Version.Type.Release) } } } diff --git a/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/FlashcatSite.kt b/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/FlashcatSite.kt index 917901bc..9d3186c9 100644 --- a/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/FlashcatSite.kt +++ b/dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/FlashcatSite.kt @@ -11,14 +11,14 @@ package com.datadog.gradle.plugin */ enum class FlashcatSite(internal val id: String, internal val intakeHostName: String) { /** - * The CN site: [browser.flashcat.cloud](https://browser.flashcat.cloud). + * The CN site: [ci.flashcat.cloud](https://ci.flashcat.cloud). */ - CN("cn", "browser.flashcat.cloud"), + CN("cn", "ci.flashcat.cloud"), /** - * The STAGING site (internal usage only): [jira.flashcat.cloud](https://jira.flashcat.cloud). + * The STAGING site (internal usage only): [ci-dev.flashcat.cloud](https://ci-dev.flashcat.cloud). */ - STAGING("staging", "jira.flashcat.cloud"); + STAGING("staging", "ci-dev.flashcat.cloud"); /** The intake endpoint url. */ val intakeEndpoint: String = "https://$intakeHostName" diff --git "a/\345\277\253\351\200\237\345\274\200\345\247\213.md" "b/\345\277\253\351\200\237\345\274\200\345\247\213.md" index f49ae970..e47c3909 100644 --- "a/\345\277\253\351\200\237\345\274\200\345\247\213.md" +++ "b/\345\277\253\351\200\237\345\274\200\345\247\213.md" @@ -15,7 +15,7 @@ ```groovy plugins { - id("cloud.flashcat.android-gradle-plugin") version "1.0.0" + id("cloud.flashcat.android-gradle-plugin") version "1.1.0" } ``` @@ -23,7 +23,7 @@ plugins { ```kotlin plugins { - id("cloud.flashcat.android-gradle-plugin") version "1.0.0" + id("cloud.flashcat.android-gradle-plugin") version "1.1.0" } ``` @@ -56,7 +56,7 @@ FC_API_KEY=your-flashcat-api-key ```json { "apiKey": "your-flashcat-api-key", - "flashcatSite": "browser.flashcat.cloud" + "flashcatSite": "ci.flashcat.cloud" } ``` @@ -94,10 +94,10 @@ flashcat { ## 🌐 可用站点 -| 站点 | 地址 | 说明 | -| ------- | ---------------------- | ------------ | -| CN | browser.flashcat.cloud | 生产环境 | -| STAGING | jira.flashcat.cloud | 内部测试环境 | +| 站点 | 地址 | 说明 | +| ------- | --------------------- | ------------ | +| CN | ci.flashcat.cloud | 生产环境 | +| STAGING | ci-dev.flashcat.cloud | 内部测试环境 | ---