Skip to content

Commit 646b46b

Browse files
author
ehowlsla
committed
unity sdk 지원을 위한 리팩토링, 코틀린 제거
1 parent 7462a27 commit 646b46b

File tree

3 files changed

+35
-28
lines changed

3 files changed

+35
-28
lines changed

‎bootpay/bootpay.iml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,46 +113,50 @@
113113
</content>
114114
<orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />
115115
<orderEntry type="sourceFolder" forTests="false" />
116-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/adapter-rxjava-2.5.0.jar:unspecified@jar" level="project" />
117-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/converter-gson-2.5.0.jar:unspecified@jar" level="project" />
118-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/retrofit-2.5.0.jar:unspecified@jar" level="project" />
119-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21@jar" level="project" />
120-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/converter-moshi-2.5.0.jar:unspecified@jar" level="project" />
116+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
117+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.31@jar" level="project" />
118+
<orderEntry type="library" name="Gradle: com.pddstudio:encrypted-preferences:1.3.0@aar" level="project" />
119+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
121120
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
121+
<orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.3.0@jar" level="project" />
122122
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
123+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:adapter-rxjava:2.5.0@jar" level="project" />
123124
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
124125
<orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" level="project" />
125-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/PersistentCookieJar-v1.0.1.aar:unspecified@jar" level="project" />
126126
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
127127
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
128+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0@jar" level="project" />
128129
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
129130
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
130131
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.0@aar" level="project" />
131132
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
132133
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.5.0@jar" level="project" />
133135
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.0.0@aar" level="project" />
134136
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
135137
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
136-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/okhttp-3.14.2.jar:unspecified@jar" level="project" />
138+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31@jar" level="project" />
137139
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:26.1.0@aar" level="project" />
138140
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
139-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/gson-2.8.5.jar:unspecified@jar" level="project" />
141+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31@jar" level="project" />
140142
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
143+
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0@jar" level="project" />
141144
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
145+
<orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.5.0@jar" level="project" />
142146
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:26.1.0@aar" level="project" />
143-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/play-services-basement-16.2.0.aar:unspecified@jar" level="project" />
147+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
148+
<orderEntry type="library" name="Gradle: com.scottyab:aescrypt:0.0.1@aar" level="project" />
144149
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:26.1.0@aar" level="project" />
145150
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/unity.jar:unspecified@jar" level="project" />
151+
<orderEntry type="library" name="Gradle: com.github.franmontiel:PersistentCookieJar:v1.0.1@aar" level="project" />
146152
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:26.1.0@aar" level="project" />
147153
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
148154
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
149155
<orderEntry type="library" name="Gradle: com.android.support:support-compat:26.1.0@aar" level="project" />
150-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/play-services-ads-identifier-16.0.0.aar:unspecified@jar" level="project" />
151-
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.21@jar" level="project" />
152156
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
153-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/okio-2.2.2.jar:unspecified@jar" level="project" />
154157
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:26.1.0@aar" level="project" />
158+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
159+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.0@jar" level="project" />
155160
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:26.1.0@aar" level="project" />
156-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/ehowlsla/AndroidStudioProjects/client_android_java/bootpay/libs/rxjava-1.3.8.jar:unspecified@jar" level="project" />
157161
</component>
158162
</module>

‎bootpay/build.gradle‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ android {
2525
}
2626

2727
dependencies {
28-
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
28+
2929
implementation 'com.android.support:appcompat-v7:26.1.0'// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
30-
// implementation files('libs/unity.jar')
30+
31+
implementation files('libs/unity.jar')
32+
//unity jar 패키징 시 아래 주석을 풀어 사용
33+
// implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
3134
// implementation files('libs/gson-2.8.5.jar')
3235
// implementation files('libs/okio-2.2.2.jar')
3336
// implementation files('libs/retrofit-2.5.0.jar')
@@ -44,17 +47,18 @@ dependencies {
4447
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
4548
exclude group: 'com.android.support', module: 'support-annotations'
4649
})
47-
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" // build for use kotlin in unity development
48-
// implementation 'com.google.code.gson:gson:2.8.2'
49-
// implementation 'com.squareup.retrofit2:retrofit:2.3.0'
50-
// implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
51-
// implementation 'com.squareup.retrofit2:converter-moshi:2.3.0'
52-
// implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
53-
// implementation 'com.squareup.okhttp3:okhttp:3.10.0'
54-
// implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
55-
56-
// implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
57-
// implementation 'com.pddstudio:encrypted-preferences:1.3.0'
50+
// jitpack 배포시 아래 주석을 풀어서 사용
51+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" // build for use kotlin in unity development
52+
implementation 'com.google.code.gson:gson:2.8.5'
53+
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
54+
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
55+
implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
56+
implementation 'com.squareup.retrofit2:adapter-rxjava:2.5.0'
57+
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
58+
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
59+
60+
implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
61+
implementation 'com.pddstudio:encrypted-preferences:1.3.0'
5862

5963

6064
implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.21'

‎sample/sample.iml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -88,7 +88,6 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />

0 commit comments

Comments
 (0)