diff --git a/app/build.gradle b/app/build.gradle index 1a466af..1db9f5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,8 +26,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } dataBinding { @@ -41,8 +41,8 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation project(path: ':commonLib') // 添加kotlin依赖 diff --git a/build.gradle b/build.gradle index 8d6a5cc..4e4a564 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/commonLib/build.gradle b/commonLib/build.gradle index bace06a..68b6d63 100644 --- a/commonLib/build.gradle +++ b/commonLib/build.gradle @@ -12,8 +12,6 @@ android { defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode rootProject.ext.android.versionCode - versionName rootProject.ext.android.versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -32,8 +30,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } androidExtensions { @@ -46,10 +44,10 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' // 添加kotlin依赖 implementation rootProject.ext.dependencies.kotlin diff --git a/commonLib/src/main/assets/baseUrl.properties b/commonLib/src/main/assets/baseUrl.properties index 8f9b83a..55f0883 100644 --- a/commonLib/src/main/assets/baseUrl.properties +++ b/commonLib/src/main/assets/baseUrl.properties @@ -1,2 +1,2 @@ -debug1 = https://www.wanandroid.com -debug2 = https://www.baidu.com +debug1 = https://www.wanandroid +debug2 = https://www.baidu diff --git a/commonLibConfig.gradle b/commonLibConfig.gradle index 359a59d..faa5d09 100644 --- a/commonLibConfig.gradle +++ b/commonLibConfig.gradle @@ -15,8 +15,8 @@ ext { ] compileOptions = [ - sourceCompatibility: JavaVersion.VERSION_1_8, - targetCompatibility: JavaVersion.VERSION_1_8, + sourceCompatibility: JavaVersion.VERSION_11, + targetCompatibility: JavaVersion.VERSION_11, ] versions = [ @@ -27,7 +27,7 @@ ext { rxjava : "3.0.13", rxandroid : "3.0.0", kotlin : "1.5.10", - converter_gson : "2.4.0", + converter_gson : '2.9.0', retrofit_rxjava : "2.9.0", room : "2.3.0", jxl : "2.6.12", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7978838..821bf44 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jul 15 16:06:54 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME +zipStoreBase=GRADLE_USER_HOME \ No newline at end of file