fix:visitend (#27)

* upgrade giokit to v2.1.2 * Fix the compilation failure issue caused by not calling the super method in visitEnd. * upgrade ci and delete android sdk setup
growingio · May 31, 2024 · 7af89f9 · 7af89f9
1 parent 522d428
commit 7af89f9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -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') }}

diff --git a/.github/workflows/saas_publish.yml b/.github/workflows/saas_publish.yml
@@ -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') }}

diff --git a/...pper-impl/src/main/kotlin/com/growingio/android/plugin/visitor/InjectSuperClassVisitor.kt b/...pper-impl/src/main/kotlin/com/growingio/android/plugin/visitor/InjectSuperClassVisitor.kt
@@ -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

diff --git a/autotracker-gradle-plugin/build.gradle.kts b/autotracker-gradle-plugin/build.gradle.kts
@@ -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)
     }
 }
 

diff --git a/autotracker-gradle-plugin/saas-gradle-plugin/build.gradle.kts b/autotracker-gradle-plugin/saas-gradle-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 buildscript {
     extra.apply {
-        set("saasVersion", "2.10.0")
-        set("saasVersionCode", "21000")
+        set("saasVersion", "2.10.2")
+        set("saasVersionCode", "21002")
     }
 }
 

diff --git a/...gradle-plugin/src/main/kotlin/com/growingio/android/plugin/giokit/GioKitNetworkAdapter.kt b/...gradle-plugin/src/main/kotlin/com/growingio/android/plugin/giokit/GioKitNetworkAdapter.kt
@@ -49,7 +49,7 @@ internal class GioKitNetworkAdapter(
                 super.visitMethodInsn(
                     Opcodes.INVOKEVIRTUAL,
                     "okhttp3/OkHttpClient\$Builder",
-                    "addInterceptor",
+                    "addNetworkInterceptor",
                     "(Lokhttp3/Interceptor;)Lokhttp3/OkHttpClient\$Builder;",
                     false
                 )

diff --git a/...cker-gradle-plugin/src/main/kotlin/com/growingio/android/plugin/giokit/GioKitProcessor.kt b/...cker-gradle-plugin/src/main/kotlin/com/growingio/android/plugin/giokit/GioKitProcessor.kt
@@ -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"
 }