Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:visitend #27

Merged
merged 7 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,15 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11

- name: Setup Android SDK
uses: android-actions/setup-android@v2

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11

# Gradle 缓存配置
- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/saas_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11

# Gradle 缓存配置
- name: Cache Gradle packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class InjectSuperClassVisitor(
// 生成未实现的 override 方法
for (targetClass in mTargetClasses) {
// 若是该方法是需要接口实现的,则不做方法生成
if (targetClass.isInterface) return
if (targetClass.isInterface) break
for (targetMethod in targetClass.targetMethods) {
if (!mOverrideMethods.contains(targetMethod)) {
val injectMethods = targetMethod.injectMethods
Expand Down
4 changes: 2 additions & 2 deletions autotracker-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ buildscript {
set("kotlin_version", "1.8.20")
set("agp_version", "8.1.0")
set("low_agp_version", "4.2.2")
set("releaseVersion", "4.2.0")
set("releaseVersionCode", 40200)
set("releaseVersion", "4.3.0")
set("releaseVersionCode", 40300)
}
}

Expand Down
4 changes: 2 additions & 2 deletions autotracker-gradle-plugin/saas-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
extra.apply {
set("saasVersion", "2.10.0")
set("saasVersionCode", "21000")
set("saasVersion", "2.10.2")
set("saasVersionCode", "21002")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ internal class GioKitNetworkAdapter(
super.visitMethodInsn(
Opcodes.INVOKEVIRTUAL,
"okhttp3/OkHttpClient\$Builder",
"addInterceptor",
"addNetworkInterceptor",
"(Lokhttp3/Interceptor;)Lokhttp3/OkHttpClient\$Builder;",
false
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,5 +213,5 @@ object GioKitProcessor {

private const val GIOKIT_DEPEND = "com.growingio.giokit:giokit"
private const val GIOKIT_DEPEND_NOOP = "com.growingio.giokit:giokit-no-op"
private const val GIOKIT_DEFAULT_VERSION = "2.1.1"
private const val GIOKIT_DEFAULT_VERSION = "2.1.2"
}