diff --git a/ZJYXDXJ/app/build.gradle b/ZJYXDXJ/app/build.gradle index 5aa7e4f..5dc759d 100755 --- a/ZJYXDXJ/app/build.gradle +++ b/ZJYXDXJ/app/build.gradle @@ -1,15 +1,16 @@ plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) } + android { namespace 'com.bjzc.zjyxdxj' - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.bjzc.zjyxdxj" minSdk 24 - targetSdk 34 + targetSdk 35 versionCode 19 versionName "1.0.1" multiDexEnabled true @@ -39,7 +40,6 @@ android { abortOnError false } minifyEnabled false //开启代码混淆，防止反编译查看源代码 - zipAlignEnabled true // 对齐zip debuggable false // 是否debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release // 打包签名信息 @@ -51,15 +51,30 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + + implementation libs.androidx.core.ktx + implementation libs.androidx.appcompat + implementation libs.material + implementation libs.androidx.activity + implementation libs.androidx.constraintlayout + testImplementation libs.junit + androidTestImplementation libs.androidx.junit + androidTestImplementation libs.androidx.espresso.core + + +// implementation 'androidx.appcompat:appcompat:1.2.0' +// implementation 'androidx.constraintlayout:constraintlayout:2.0.4' +// implementation 'com.google.android.material:material:1.2.1' + + + // implementation 'com.zhy:autolayout:1.4.5' // implementation 'com.yolanda.nohttp:nohttp:1.0.5' @@ -81,7 +96,7 @@ dependencies { implementation project(':luban') - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' @@ -109,46 +124,8 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' //本地广播 implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - testImplementation 'junit:junit:4.13.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' configurations { all*.exclude group: 'com.google.code.gson' } - -// implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0' -// implementation 'com.squareup.retrofit2:retrofit:2.9.0' -// implementation 'com.squareup.retrofit2:converter-gson:2.9.0' -// -// implementation 'com.yanzhenjie:permission:2.0.3' -// implementation 'com.github.huangyanbin:SmartTable:2.2.0' -// implementation 'com.google.android.material:material:1.2.1' -// implementation 'androidx.multidex:multidex:2.0.1' -// implementation 'androidx.recyclerview:recyclerview:1.1.0' -// implementation 'de.hdodenhof:circleimageview:3.1.0' -// implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.9' -// implementation 'com.github.wanglu1209:PhotoViewer:0.50' -// implementation 'io.github.azhon:appupdate:4.2.6' -// implementation 'com.tencent.bugly:crashreport:3.2.1' -// implementation 'com.github.xuexiangjys:XUI:1.1.4' -// implementation files('libs/rinsunMT.jar') -// implementation 'org.greenrobot:eventbus:3.0.0' -// implementation 'com.github.bumptech.glide:glide:4.11.0' -// -// -// //第三方工具类 -// implementation 'cn.hutool:hutool-all:5.8.5' -// //mqtt -// implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.4' -// implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1' -// implementation 'org.bouncycastle:bcpkix-jdk15on:1.56' -// implementation 'org.bouncycastle:bcpkix-jdk15on:1.47' -// implementation 'commons-codec:commons-codec:1.15' -// testImplementation 'junit:junit:4.13.1' -// androidTestImplementation 'androidx.test.ext:junit:1.1.2' -// androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -// configurations { -// all*.exclude group: 'com.google.code.gson' -// } } diff --git a/ZJYXDXJ/autolayout/build.gradle b/ZJYXDXJ/autolayout/build.gradle index 3986e80..bb807e2 100644 --- a/ZJYXDXJ/autolayout/build.gradle +++ b/ZJYXDXJ/autolayout/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 24 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.zhy.autolayout' } - dependencies { - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation libs.androidx.appcompat.v170 } \ No newline at end of file diff --git a/ZJYXDXJ/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java b/ZJYXDXJ/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java index 1138d9c..21143db 100644 --- a/ZJYXDXJ/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java +++ b/ZJYXDXJ/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java @@ -3,7 +3,7 @@ package com.zhy.autolayout; import android.content.Context; import android.util.AttributeSet; import android.view.View; -;import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; /** * Created by zhy on 15/11/19. diff --git a/ZJYXDXJ/build.gradle b/ZJYXDXJ/build.gradle index e3de8aa..e475d61 100755 --- a/ZJYXDXJ/build.gradle +++ b/ZJYXDXJ/build.gradle @@ -1,8 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +//plugins { +// id 'com.android.application' version '8.6.0' apply false +// id 'org.jetbrains.kotlin.android' version '1.8.0' apply false +//} + plugins { - id 'com.android.application' version '8.6.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.0' apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false } diff --git a/ZJYXDXJ/gradle.properties b/ZJYXDXJ/gradle.properties index 2034471..eee1d77 100755 --- a/ZJYXDXJ/gradle.properties +++ b/ZJYXDXJ/gradle.properties @@ -10,6 +10,7 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.nonTransitiveRClass=true #android.defaults.buildfeatures.buildconfig=true #android.enableJetifier=true diff --git a/ZJYXDXJ/gradle/libs.versions.toml b/ZJYXDXJ/gradle/libs.versions.toml new file mode 100644 index 0000000..4ffe11f --- /dev/null +++ b/ZJYXDXJ/gradle/libs.versions.toml @@ -0,0 +1,38 @@ +[versions] +agp = "8.8.0" +androidxAppcompatVersion = "1.1.0" +annotationVersion = "1.8.2" +appcompatVersion = "1.7.0" +glide = "4.11.0" +kotlin = "1.9.24" +coreKtx = "1.10.1" +junit = "4.13.2" +junitVersion = "1.1.5" +espressoCore = "3.5.1" +appcompat = "1.6.1" +material = "1.10.0" +activity = "1.8.0" +constraintlayout = "2.1.4" +recyclerview = "1.3.0" +squareupPicasso = "2.5.2" + +[libraries] +androidx-appcompat-v170 = { module = "androidx.appcompat:appcompat", version.ref = "appcompatVersion" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" } +annotation = { module = "androidx.annotation:annotation", version.ref = "annotationVersion" } +appcompat-v110 = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompatVersion" } +com-squareup-picasso-picasso = { module = "com.squareup.picasso:picasso", version.ref = "squareupPicasso" } +glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } + diff --git a/ZJYXDXJ/gradle/wrapper/gradle-wrapper.properties b/ZJYXDXJ/gradle/wrapper/gradle-wrapper.properties index 3d055a1..47ff547 100644 --- a/ZJYXDXJ/gradle/wrapper/gradle-wrapper.properties +++ b/ZJYXDXJ/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 16 09:24:15 CST 2020 +#Thu Jan 16 17:33:21 CST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/ZJYXDXJ/litepal/build.gradle b/ZJYXDXJ/litepal/build.gradle index d4de868..f4a269f 100644 --- a/ZJYXDXJ/litepal/build.gradle +++ b/ZJYXDXJ/litepal/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 24 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'org.litepal' diff --git a/ZJYXDXJ/luban/build.gradle b/ZJYXDXJ/luban/build.gradle index 4db413e..4e0c129 100644 --- a/ZJYXDXJ/luban/build.gradle +++ b/ZJYXDXJ/luban/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 24 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'top.zibin.luban' diff --git a/ZJYXDXJ/matisse/build.gradle b/ZJYXDXJ/matisse/build.gradle index e012cf5..a941fcc 100644 --- a/ZJYXDXJ/matisse/build.gradle +++ b/ZJYXDXJ/matisse/build.gradle @@ -2,22 +2,29 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 24 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.zhihu.matisse' } dependencies { - implementation "androidx.appcompat:appcompat:1.1.0" - implementation "androidx.annotation:annotation:1.1.0" - implementation "androidx.recyclerview:recyclerview:1.0.0" +// implementation "androidx.appcompat:appcompat:1.1.0" +// implementation "androidx.annotation:annotation:1.1.0" +// implementation "androidx.recyclerview:recyclerview:1.0.0" +// implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4' +// compileOnly 'com.github.bumptech.glide:glide:4.9.0' +// compileOnly 'com.squareup.picasso:picasso:2.5.2' + implementation libs.appcompat.v110 + implementation libs.annotation + implementation libs.androidx.recyclerview + //noinspection UseTomlInstead implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4' - compileOnly 'com.github.bumptech.glide:glide:4.9.0' - compileOnly 'com.squareup.picasso:picasso:2.5.2' + compileOnly libs.glide + compileOnly libs.com.squareup.picasso.picasso } diff --git a/ZJYXDXJ/nohttp/build.gradle b/ZJYXDXJ/nohttp/build.gradle index f1baad0..859d8e9 100644 --- a/ZJYXDXJ/nohttp/build.gradle +++ b/ZJYXDXJ/nohttp/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdk 34 + compileSdk 35 defaultConfig { minSdk 24 - targetSdk 34 + targetSdk 35 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } namespace 'com.yolanda.nohttp'