Parcourir la source

修改ignore+update依赖版本

damon.tan il y a 4 ans
Parent
commit
526a4cd0ea

+ 3 - 3
.gitignore

@@ -1,10 +1,8 @@
 .gradle
 local.properties
-gradle.properties
 .DS_Store
 build/
 captures/
-
 # built application files
 *.apk
 *.ap_
@@ -31,4 +29,6 @@ proguard/
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+gradle/
+

+ 8 - 8
app/build.gradle

@@ -2,8 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.0"
+    buildToolsVersion "30.0.1"
 
+    buildFeatures{
+        dataBinding = true
+    }
+    
     defaultConfig {
         applicationId "com.poto.timeservice"
         minSdkVersion 21
@@ -29,17 +33,13 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    dataBinding {
-        enabled = true
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -47,5 +47,5 @@ dependencies {
     implementation 'com.jakewharton:butterknife:10.2.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
 
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }

+ 1 - 1
app/src/main/java/com/poto/timeservice/Member/PoCreateMemberAdapter.java

@@ -64,7 +64,7 @@ public class PoCreateMemberAdapter extends RecyclerView.Adapter<PoCreateMemberAd
             case PoMemberEditRowDate:
             case PoMemberEditRowProvCA:
             case PoMemberEditRowStrList: {
-                holder.inputField
+                //holder.inputField
             }
                 break;
             case PoMemberEditRowInput:

+ 2 - 2
build.gradle

@@ -8,12 +8,12 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
     }
 }

+ 1 - 0
gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX = true

BIN
gradle/wrapper/gradle-wrapper.jar


+ 0 - 6
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Sun Jun 21 22:29:53 CST 2020
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME

+ 0 - 0
gradlew