use java 11 (#7)

min sdk require: Java 11
growingio · Jun 25, 2023 · ee85fac · ee85fac
1 parent b4a708b
commit ee85fac
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 36 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 11
 
       # Gradle 缓存配置
       - name: Cache Gradle packages

diff --git a/.github/workflows/publish_manual.yml b/.github/workflows/publish_manual.yml
@@ -8,12 +8,14 @@ jobs:
     # main 分支的发布请走正式流程，手动仅能发布其他分支的beta版本，用于测试
     if: ${{ github.ref != 'refs/heads/master' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: 11
+
 
       # Gradle 缓存配置
       - name: Cache Gradle packages

diff --git a/app-saas/build.gradle b/app-saas/build.gradle
@@ -7,8 +7,6 @@ plugins {
 }
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-
     defaultConfig {
         applicationId "com.growingio.saas"
         minSdkVersion 21
@@ -27,11 +25,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,6 @@ plugins {
 }
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-
     defaultConfig {
         applicationId rootProject.ext.android.applicationId + ".v3"
         minSdkVersion 21
@@ -26,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     apply from: "config.gradle"
     ext {
         kotlin_version = "1.7.10"
-        agp_version = System.getenv('AGP_VERSION') ?: "7.3.0"
+        agp_version = System.getenv('AGP_VERSION') ?: "7.4.2"
     }
 }
 

diff --git a/config.gradle b/config.gradle
@@ -3,15 +3,15 @@ ext {
             compileSdkVersion         : 32,
             applicationId             : "com.growingio.giokit",
             minSdkVersion             : 17,
-            targetSdkVersion          : 30,
+            targetSdkVersion          : 32,
             //app版本号
             versionCode               : 14,
             versionName               : "1.4.0",
 
             kotlin_version            : "1.7.10",
             kotlinx_coroutines_version: "1.6.2",
             gradle_plugin_version     : "4.2.2",
-            giokit_plugin_version     : "7.2.2",
+            giokit_plugin_version     : "7.4.2",
             okhttp_v3                 : "3.14.7",
             okhttp_v4                 : "4.7.0",
 

diff --git a/giokit-no-op/build.gradle b/giokit-no-op/build.gradle
@@ -4,8 +4,6 @@ plugins {
     id 'kotlin-kapt'
 }
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -23,11 +21,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 

diff --git a/giokit-plugin/build.gradle b/giokit-plugin/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = "1.6.21"
-        agp_version = System.getenv('AGP_VERSION') ?: "7.2.1"
+        kotlin_version = "1.7.10"
+        agp_version = System.getenv('AGP_VERSION') ?: "7.4.2"
     }
 }
 
@@ -28,7 +28,7 @@ gradlePlugin{
 }
 
 dependencies{
-    implementation "com.growingio.android:growingio-plugin-library:3.4.6"
+    implementation "com.growingio.android:growingio-plugin-library:3.5.0"
     implementation gradleApi()
     compileOnly "com.android.tools.build:gradle:$agp_version"
     compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/giokit/build.gradle b/giokit/build.gradle
@@ -5,7 +5,6 @@ plugins {
 }
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -24,11 +23,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -20,7 +20,6 @@ pluginManagement {
 dependencyResolutionManagement {
     //repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        jcenter()
         mavenLocal()
         maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
         google()

diff --git a/uikit/build.gradle b/uikit/build.gradle
@@ -3,8 +3,6 @@ plugins {
 }
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -22,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }