Sfoglia il codice sorgente

Update AGP to 8.14.2

zhpanvip 2 settimane fa
parent
commit
011b4994c8

+ 18 - 13
app/build.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android'
 android {
 android {
-  compileSdkVersion 33
+  namespace 'com.example.zhpan.banner'
+  compileSdk 35
   defaultConfig {
   defaultConfig {
     applicationId "com.example.zhpan.bannerviewpager"
     applicationId "com.example.zhpan.bannerviewpager"
     minSdkVersion 21
     minSdkVersion 21
@@ -25,8 +26,12 @@ android {
   }
   }
 
 
   compileOptions {
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+
+  kotlinOptions {
+    jvmTarget = "17"
   }
   }
 
 
   viewBinding {
   viewBinding {
@@ -46,7 +51,7 @@ repositories {
 
 
 dependencies {
 dependencies {
   implementation fileTree(include: ['*.jar'], dir: 'libs')
   implementation fileTree(include: ['*.jar'], dir: 'libs')
-  implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+  implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
   androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
   androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
     exclude group: 'com.android.support', module: 'support-annotations'
     exclude group: 'com.android.support', module: 'support-annotations'
@@ -62,22 +67,22 @@ dependencies {
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
   implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
   implementation 'com.squareup.okhttp3:logging-interceptor:4.8.1'
 
 
-  implementation 'androidx.appcompat:appcompat:1.3.0'
-  implementation 'androidx.recyclerview:recyclerview:1.2.1'
+  implementation 'androidx.appcompat:appcompat:1.7.1'
+  implementation 'androidx.recyclerview:recyclerview:1.4.0'
   implementation 'com.github.bumptech.glide:glide:4.11.0'
   implementation 'com.github.bumptech.glide:glide:4.11.0'
   implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0'
   implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0'
   implementation 'io.github.scwang90:refresh-header-classics:2.1.0'
   implementation 'io.github.scwang90:refresh-header-classics:2.1.0'
   implementation  'io.github.scwang90:refresh-header-material:2.1.0'
   implementation  'io.github.scwang90:refresh-header-material:2.1.0'
   debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
   debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
-  implementation 'androidx.core:core-ktx:1.6.0'
+  implementation 'androidx.core:core-ktx:1.16.0'
   implementation 'androidx.cardview:cardview:1.0.0'
   implementation 'androidx.cardview:cardview:1.0.0'
-  implementation 'androidx.viewpager2:viewpager2:1.0.0'
+  implementation 'androidx.viewpager2:viewpager2:1.1.0'
   implementation 'io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4'
   implementation 'io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.4'
-  implementation 'com.google.android.material:material:1.3.0'
-  implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
-  implementation "androidx.navigation:navigation-ui-ktx:2.3.5"
-  implementation 'com.tencent.bugly:crashreport:3.2.1'
-  implementation 'com.google.android.material:material:1.3.0'
+  implementation 'com.google.android.material:material:1.12.0'
+  implementation "androidx.navigation:navigation-fragment-ktx:2.9.0"
+  implementation "androidx.navigation:navigation-ui-ktx:2.9.0"
+  implementation 'com.tencent.bugly:crashreport:4.1.9.3'
+  implementation 'com.google.android.material:material:1.12.0'
   implementation 'com.blankj:utilcodex:1.30.6'
   implementation 'com.blankj:utilcodex:1.30.6'
   implementation 'com.airbnb.android:lottie:3.4.1'
   implementation 'com.airbnb.android:lottie:3.4.1'
   //    implementation 'com.github.zhpanvip:bannerviewpager:3.5.6'
   //    implementation 'com.github.zhpanvip:bannerviewpager:3.5.6'

+ 1 - 2
app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.zhpan.banner">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

+ 12 - 2
bannerview/build.gradle

@@ -1,12 +1,22 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android'
 android {
 android {
-    compileSdkVersion 28
+    namespace 'com.zhpan.bannerview'
+    compileSdk 35
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 19
         minSdkVersion 19
     }
     }
 
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
     buildTypes {
     buildTypes {
         release {
         release {
             minifyEnabled false
             minifyEnabled false
@@ -16,7 +26,7 @@ android {
 }
 }
 
 
 dependencies {
 dependencies {
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     api 'com.github.zhpanvip:viewpagerindicator:1.2.3'
     api 'com.github.zhpanvip:viewpagerindicator:1.2.3'
 //    api project(path: ':indicator')
 //    api project(path: ':indicator')
 }
 }

+ 1 - 2
bannerview/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhpan.bannerview" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

+ 3 - 3
build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 
 buildscript {
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '2.0.0'
     repositories {
     repositories {
         mavenCentral()
         mavenCentral()
         google()
         google()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.10.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
     }
@@ -21,7 +21,7 @@ allprojects {
     }
     }
 }
 }
 
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
     delete rootProject.buildDir
 }
 }
 
 

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Apr 11 17:35:28 CST 2020
+#Wed Jun 11 23:30:51 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip