瀏覽代碼

功能开发:更新工程的配置文件。适配新版本的Android Studio

Sora 1 年之前
父節點
當前提交
bb242f5cd4
共有 7 個文件被更改,包括 9 次插入6101 次删除
  1. 1 0
      .idea/gradle.xml
  2. 0 1
      app/build.gradle
  3. 2 2
      build.gradle
  4. 4 1
      gradle.properties
  5. 1 2
      gradle/wrapper/gradle-wrapper.properties
  6. 0 6094
      replay_pid4340.log
  7. 1 1
      ucrop/build.gradle

+ 1 - 0
.idea/gradle.xml

@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

+ 0 - 1
app/build.gradle

@@ -166,7 +166,6 @@ configurations.all {
 }
 
 dependencies {
-
     // QQ 互联SDK,用于QQ分享、登录
 //    implementation files('libs/open_sdk_3.5.14.3_rc26220c_lite.jar')
     implementation files('libs/open_sdk_r5923_lite.jar')

+ 2 - 2
build.gradle

@@ -12,7 +12,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath 'com.jakewharton:butterknife-gradle-plugin:+'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:+'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
@@ -38,7 +38,7 @@ allprojects {
         mavenCentral()
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/google' }
-        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
         maven {
             url 'https://raw.githubusercontent.com/MDL-Sinlov/MDL-Android-Repo/master/mvn-repo/'
         }

+ 4 - 1
gradle.properties

@@ -39,5 +39,8 @@ android.debug.obsoleteApi=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m \
+--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 android.injected.testOnly=false

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

@@ -1,6 +1,5 @@
-#Mon Sep 16 09:09:09 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.1.1-all.zip

文件差異過大導致無法顯示
+ 0 - 6094
replay_pid4340.log


+ 1 - 1
ucrop/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-apply from: '../mavenpush.gradle'
+//apply from: '../mavenpush.gradle'
 
 android {
     compileSdkVersion ANDROID_COMPILE_SDK_VERSION as int