Skip to content

Commit

Permalink
버전 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
aerimforest committed Dec 25, 2021
1 parent 15cd881 commit 1397f49
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 37 deletions.
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -30,38 +30,38 @@ 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'
implementation 'com.airbnb.android:lottie:3.0.7'

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')
Expand Down
14 changes: 0 additions & 14 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zoosumzoosum.zoosumx2">

<!-- <queries>-->
<!-- <package android:name="com.kakao.talk"/>-->
<!-- </queries>-->

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Expand All @@ -32,10 +28,8 @@
<activity android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="oauth"
android:scheme="kakao4e50b407032508e73f0024e851a1dbcc" />
Expand All @@ -47,14 +41,11 @@
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="kakaolink"
android:scheme="kakao4e50b407032508e73f0024e851a1dbcc" />

</intent-filter>
</activity>

Expand Down Expand Up @@ -84,7 +75,6 @@
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand All @@ -109,15 +99,12 @@
<activity
android:name="com.zoosumzoosum.zoosumx2.IslandNameActivity"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name="com.zoosumzoosum.zoosumx2.RandomQuizActivity"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name="com.zoosumzoosum.zoosumx2.UserNameActivity"
android:theme="@style/AppTheme.NoActionBar" />

<provider
android:authorities="com.zoosumzoosum.zoosumx2.fileprovider"
android:name="androidx.core.content.FileProvider"
Expand All @@ -128,5 +115,4 @@
android:resource="@xml/file_paths"/>
</provider>
</application>

</manifest>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1397f49

Please # to comment.