Skip to content

Commit

Permalink
Github Actions ->需要使用JDK17来构建
Browse files Browse the repository at this point in the history
  • Loading branch information
liyujiang-gzu committed Nov 1, 2023
1 parent 5b01d64 commit 34d010b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-apk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ allprojects {
}
}
```
如果你的 Gradle 配置是 7.0 及以上,则需要在 settings.gradle 文件中加入:
如果你的 Gradle 配置是 7.0 及以上,可能需要在 settings.gradle 文件中加入:

```groovy
dependencyResolutionManagement {
Expand All @@ -50,13 +50,21 @@ dependencies {
}
```

除了依赖从 Github 拉取代码构建的包外,也可以依赖从码云构建的包:

```groovy
dependencies {
implementation 'com.gitee.li_yu_jiang:Android_CN_OAID:最新版本号'
}
```

### 注意事项

- **4.2.5.1 版本以后直接使用了华为官方广告标识服务SDK,与移动安全联盟 SDK 共存** 的话可参考如下配置(PS:暂时没太多经历逆向华为的SDK重构包名来共存):

```groovy
dependencies {
implementation('com.github.gzu-liyujiang:Android_CN_OAID:<version>') {
implementation('com.github.gzu-liyujiang:Android_CN_OAID:最新版本号') {
// 如果使用了移动安全联盟SDK,共存的话需排除掉本项目依赖的华为官方广告标识服务SDK,因为移动安全联盟SDK也依赖了华为的SDK
// 如果华为官方广告标识服务SDK下载失败或编译报错的话,可考虑在 build.gradle 中增加以下配置:
// repositories { maven {url 'https://developer.huawei.com/repo/'} }
Expand Down

0 comments on commit 34d010b

Please sign in to comment.