From 1397f49669513fb2778fbdc09d30841f4edb073b Mon Sep 17 00:00:00 2001 From: aerimforest Date: Sat, 25 Dec 2021 13:44:05 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 + .idea/compiler.xml | 6 ++++ .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- app/build.gradle | 36 ++++++++++++------------ app/src/main/AndroidManifest.xml | 14 --------- build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 4 +-- 8 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..9514dbf --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ZOOSUMX2 \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ac6b0ae..23a89bb 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 770f9e9..63d0cd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,14 +5,14 @@ apply plugin: 'com.google.gms.google-services' android { compileSdkVersion 30 - buildToolsVersion "30.0.1" + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.zoosumzoosum.zoosumx2" minSdkVersion 21 targetSdkVersion 30 - versionCode 3 - versionName "1.1.1" + versionCode 4 + versionName "1.1.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -30,22 +30,22 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) //noinspection GradleDependency implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' //noinspection GradleCompatible implementation 'com.android.support:design:28.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.2.1' - implementation 'de.hdodenhof:circleimageview:3.0.1' - implementation 'com.google.firebase:firebase-auth:20.0.0' - implementation 'com.google.android.gms:play-services-auth:18.1.0' + implementation 'com.google.android.material:material:1.4.0' + implementation 'de.hdodenhof:circleimageview:3.1.0' + implementation 'com.google.firebase:firebase-auth:21.0.1' + implementation 'com.google.android.gms:play-services-auth:20.0.0' implementation 'gun0912.ted:tedpermission:2.2.3' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'com.google.android.gms:play-services-auth:18.1.0' - implementation 'com.google.firebase:firebase-firestore:22.0.0' // Firestore 연결 + implementation 'com.google.android.gms:play-services-auth:20.0.0' + implementation 'com.google.firebase:firebase-firestore:24.0.0' // Firestore 연결 // FirebaseUI for Cloud Firestore implementation 'com.firebaseui:firebase-ui-firestore:6.2.1' implementation 'com.android.support:multidex:1.0.3' @@ -53,15 +53,15 @@ dependencies { implementation 'gun0912.ted:tedpermission:2.2.3' // lottie - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'//인디케이터 오픈소스 implementation "com.kakao.sdk:v2-user:2.0.0" implementation "com.kakao.sdk:v2-link:2.0.4" - implementation 'com.google.firebase:firebase-storage-ktx:19.2.0' + implementation 'com.google.firebase:firebase-storage-ktx:20.0.0' implementation 'com.firebaseui:firebase-ui-storage:6.2.0' implementation platform('com.google.firebase:firebase-bom:25.12.0') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 04e49d5..37b15d7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,10 +2,6 @@ - - - - @@ -32,10 +28,8 @@ - - @@ -47,14 +41,11 @@ android:theme="@style/AppTheme.NoActionBar"> - - - @@ -84,7 +75,6 @@ android:theme="@style/AppTheme.NoActionBar"> - @@ -109,15 +99,12 @@ - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index c44d24c..8873ccb 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.0.2" + classpath "com.android.tools.build:gradle:4.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.4' + classpath 'com.google.gms:google-services:4.3.10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63da5eb..65cc3c1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 17 23:50:13 KST 2020 +#Sat Dec 25 13:42:38 KST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip