Skip to content

Commit 0b9e894

Browse files
ccjengccjeng
committed
no message
1 parent 67c04ae commit 0b9e894

11 files changed

+853
-677
lines changed

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml

+753-581
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TPTrashCan.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="TPTrashCan" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="TPTrashCan" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎app/app.iml

+63-66
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TPTrashCan" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -32,6 +32,7 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
@@ -111,70 +112,66 @@
111112
</content>
112113
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
113114
<orderEntry type="sourceFolder" forTests="false" />
114-
<orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
115-
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.0.0" level="project" />
116-
<orderEntry type="library" name="com.facebook.android:audience-network-sdk-4.26.1" level="project" />
117-
<orderEntry type="library" name="com.google.android.gms:play-services-tagmanager-v4-impl-11.4.2" level="project" />
118-
<orderEntry type="library" name="com.google.firebase:firebase-ads-11.4.2" level="project" />
119-
<orderEntry type="library" name="com.google.android.exoplayer:exoplayer-r2.0.3" level="project" />
120-
<orderEntry type="library" name="__local_aars__:/Users/andycheng/Dropbox/Project/TPTrashCan/app/libs/vpadn-sdk-obf466-50907102-1709051709-67cc94a.jar:unspecified@jar" level="project" />
121-
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
122-
<orderEntry type="library" name="com.mikepenz:aboutlibraries-5.7.1" level="project" />
123-
<orderEntry type="library" name="com.android.support:support-core-utils-27.0.0" level="project" />
124-
<orderEntry type="library" name="com.google.android.gms:play-services-base-license-11.4.2" level="project" />
125-
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
126-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.4.2" level="project" />
127-
<orderEntry type="library" name="com.android.support:support-compat-27.0.0" level="project" />
128-
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.0.0" level="project" />
129-
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.4.2" level="project" />
130-
<orderEntry type="library" name="com.mikepenz:iconics-core-2.6.6" level="project" />
131-
<orderEntry type="library" name="com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
132-
<orderEntry type="library" name="com.android.support:support-core-ui-27.0.0" level="project" />
133-
<orderEntry type="library" name="com.google.firebase:firebase-common-11.4.2" level="project" />
134-
<orderEntry type="library" name="com.google.firebase:firebase-database-connection-license-11.4.2" level="project" />
135-
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
136-
<orderEntry type="library" name="com.google.android.gms:play-services-ads-11.4.2" level="project" />
137-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.4.2" level="project" />
138-
<orderEntry type="library" name="com.google.android.gms:play-services-ads-lite-license-11.4.2" level="project" />
139-
<orderEntry type="library" name="com.google.firebase:firebase-core-11.4.2" level="project" />
140-
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.4.2" level="project" />
141-
<orderEntry type="library" name="com.google.android.gms:play-services-location-license-11.4.2" level="project" />
142-
<orderEntry type="library" name="com.google.android.gms:play-services-analytics-impl-11.4.2" level="project" />
143-
<orderEntry type="library" name="com.android.support:support-media-compat-27.0.0" level="project" />
144-
<orderEntry type="library" scope="TEST" name="com.android.support:multidex-instrumentation-1.0.2" level="project" />
145-
<orderEntry type="library" name="com.google.android.gms:play-services-ads-lite-11.4.2" level="project" />
146-
<orderEntry type="library" name="com.android.support:support-v4-27.0.0" level="project" />
147-
<orderEntry type="library" name="com.google.android.gms:play-services-base-11.4.2" level="project" />
148-
<orderEntry type="library" name="com.android.support:support-fragment-27.0.0" level="project" />
149-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.4.2" level="project" />
150-
<orderEntry type="library" name="com.android.support:appcompat-v7-27.0.0" level="project" />
151-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.4.2" level="project" />
152-
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.4.2" level="project" />
153-
<orderEntry type="library" name="com.google.android.gms:play-services-tagmanager-v4-impl-license-11.4.2" level="project" />
154-
<orderEntry type="library" name="com.google.android.gms:play-services-analytics-11.4.2" level="project" />
155-
<orderEntry type="library" name="com.android.support:design-27.0.0" level="project" />
156-
<orderEntry type="library" name="__local_aars__:/Users/andycheng/Dropbox/Project/TPTrashCan/app/libs/admob-adapter-1.0.0-1505261651-830485e.jar:unspecified@jar" level="project" />
157-
<orderEntry type="library" name="com.android.support:transition-27.0.0" level="project" />
158-
<orderEntry type="library" name="com.mikepenz:fastadapter-1.6.0" level="project" />
159-
<orderEntry type="library" name="com.google.android.gms:play-services-maps-license-11.4.2" level="project" />
160-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.4.2" level="project" />
161-
<orderEntry type="library" name="com.android.support:recyclerview-v7-27.0.0" level="project" />
162-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-11.4.2" level="project" />
163-
<orderEntry type="library" name="com.google.android.gms:play-services-analytics-impl-license-11.4.2" level="project" />
164-
<orderEntry type="library" name="com.android.support:cardview-v7-24.0.0" level="project" />
165-
<orderEntry type="library" name="com.google.ads.mediation:facebook-4.26.1.0" level="project" />
166-
<orderEntry type="library" name="com.google.android.gms:play-services-ads-license-11.4.2" level="project" />
167-
<orderEntry type="library" name="com.jakewharton:butterknife-8.8.1" level="project" />
168-
<orderEntry type="library" name="com.google.android.gms:play-services-analytics-license-11.4.2" level="project" />
169-
<orderEntry type="library" name="com.google.firebase:firebase-database-connection-11.4.2" level="project" />
170-
<orderEntry type="library" name="com.google.firebase:firebase-database-license-11.4.2" level="project" />
171-
<orderEntry type="library" name="com.google.android.gms:play-services-maps-11.4.2" level="project" />
172-
<orderEntry type="library" name="com.google.android.gms:play-services-gass-license-11.4.2" level="project" />
173-
<orderEntry type="library" name="com.google.android.gms:play-services-location-11.4.2" level="project" />
174-
<orderEntry type="library" name="com.android.support:support-annotations:27.0.0@jar" level="project" />
175-
<orderEntry type="library" name="com.google.firebase:firebase-database-11.4.2" level="project" />
176-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.4.2" level="project" />
177-
<orderEntry type="library" name="com.google.android.gms:play-services-gass-11.4.2" level="project" />
178-
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.4.2" level="project" />
115+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
116+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-core-16.0.1" level="project" />
117+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base-16.0.0" level="project" />
118+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
119+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: com.mikepenz:iconics-core-2.6.6" level="project" />
121+
<orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-r2.0.3" level="project" />
122+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics-16.0.1" level="project" />
123+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.1" level="project" />
124+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
125+
<orderEntry type="library" name="Gradle: com.facebook.android:audience-network-sdk-4.26.1" level="project" />
126+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl-16.0.1" level="project" />
127+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.1" level="project" />
128+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
129+
<orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-24.0.0" level="project" />
132+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
133+
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
135+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation-1.0.2" level="project" />
136+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
137+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.1" level="project" />
138+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics-16.0.1" level="project" />
139+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-collection-15.0.1" level="project" />
140+
<orderEntry type="library" name="Gradle: __local_aars__:/Users/andycheng/Dropbox/Project/TPTrashCan/app/libs/vpadn-sdk-obf472-13708102-1807311414-0989e85.jar:unspecified@jar" level="project" />
141+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-15.0.1" level="project" />
142+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport-15.0.1" level="project" />
143+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics-impl-16.1.1" level="project" />
144+
<orderEntry type="library" name="Gradle: com.android.support:customtabs-26.1.0" level="project" />
145+
<orderEntry type="library" name="Gradle: com.mikepenz:aboutlibraries-5.7.1" level="project" />
146+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
147+
<orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
148+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics-impl-16.0.1" level="project" />
149+
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-8.8.1" level="project" />
150+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
151+
<orderEntry type="library" name="Gradle: com.google.ads.mediation:facebook-4.26.1.0" level="project" />
152+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
153+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
154+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
155+
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
156+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-15.0.1" level="project" />
157+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
158+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
159+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.1" level="project" />
160+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier-15.0.1" level="project" />
161+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-impl-16.0.1" level="project" />
162+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-16.0.1" level="project" />
163+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location-15.0.1" level="project" />
164+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats-15.0.1" level="project" />
165+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-16.0.0" level="project" />
166+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop-16.0.0" level="project" />
167+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps-15.0.1" level="project" />
168+
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-1.6.0" level="project" />
169+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
170+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-16.0.0" level="project" />
171+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-connection-16.0.1" level="project" />
172+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-16.0.0" level="project" />
173+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
174+
<orderEntry type="library" name="Gradle: __local_aars__:/Users/andycheng/Dropbox/Project/TPTrashCan/app/libs/admob-adapter-1.0.0-1505261651-830485e.jar:unspecified@jar" level="project" />
175+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-ads-15.0.1" level="project" />
179176
</component>
180177
</module>

‎app/build.gradle

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
2-
2+
apply plugin: 'io.fabric'
33

44
android {
55
compileSdkVersion 27
6-
buildToolsVersion '26.0.2'
6+
buildToolsVersion '27.0.3'
77
defaultConfig {
88
applicationId "com.ccjeng.tptrashcan"
99
minSdkVersion 16
10-
targetSdkVersion 21
11-
versionCode 36
12-
versionName '2.1.5.110617TC'
10+
targetSdkVersion 27
11+
versionCode 37
12+
versionName '2.1.6.081218TC'
1313
multiDexEnabled true
1414
}
1515
buildTypes {
@@ -33,26 +33,25 @@ android {
3333

3434
dependencies {
3535
//compile fileTree(include: 'Parse-*.jar', dir: 'libs')
36-
compile 'com.android.support:appcompat-v7:27.0.0'
37-
compile 'com.android.support:design:27.0.0'
38-
compile 'com.google.android.gms:play-services-maps:11.4.2'
39-
compile 'com.google.android.gms:play-services-analytics:11.4.2'
40-
compile 'com.google.android.gms:play-services-location:11.4.2'
41-
compile 'com.google.firebase:firebase-core:11.4.2'
42-
compile 'com.google.firebase:firebase-database:11.4.2'
43-
compile 'com.google.firebase:firebase-ads:11.4.2'
44-
releaseCompile 'com.google.firebase:firebase-crash:11.4.2'
45-
compile 'com.android.support:multidex:1.0.2'
46-
compile 'com.jakewharton:butterknife:8.8.1'
36+
implementation 'com.android.support:appcompat-v7:27.1.1'
37+
implementation 'com.android.support:design:27.1.1'
38+
implementation 'com.google.android.gms:play-services-maps:15.0.1'
39+
implementation 'com.google.android.gms:play-services-analytics:16.0.1'
40+
implementation 'com.google.android.gms:play-services-location:15.0.1'
41+
implementation 'com.google.firebase:firebase-core:16.0.1'
42+
implementation 'com.google.firebase:firebase-database:16.0.1'
43+
implementation 'com.google.firebase:firebase-ads:15.0.1'
44+
releaseImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.4'
45+
implementation 'com.android.support:multidex:1.0.3'
46+
implementation 'com.jakewharton:butterknife:8.8.1'
4747
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
48-
compile('com.mikepenz:aboutlibraries:5.7.1@aar') {
48+
implementation('com.mikepenz:aboutlibraries:5.7.1@aar') {
4949
transitive = true
5050
}
51-
compile 'com.google.ads.mediation:facebook:4.26.1.0'
52-
compile 'com.facebook.android:audience-network-sdk:4.26.1'
53-
compile files('libs/admob-adapter-1.0.0-1505261651-830485e.jar')
54-
implementation files('libs/vpadn-sdk-obf466-50907102-1709051709-67cc94a.jar')
55-
51+
implementation 'com.google.ads.mediation:facebook:4.26.1.0'
52+
implementation 'com.facebook.android:audience-network-sdk:4.26.1'
53+
implementation files('libs/admob-adapter-1.0.0-1505261651-830485e.jar')
54+
implementation files('libs/vpadn-sdk-obf472-13708102-1807311414-0989e85.jar')
5655
}
5756

5857
apply plugin: 'com.google.gms.google-services'

‎app/libs/vpadn-sdk-obf466-50907102-1709051709-67cc94a.jar

-690 KB
Binary file not shown.

‎app/libs/vpadn-sdk-obf472-13708102-1807311414-0989e85.jar

776 KB
Binary file not shown.

‎app/release/output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":36},"path":"app-release.apk","properties":{"packageId":"com.ccjeng.tptrashcan","split":"","minSdkVersion":"16"}}]
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"2.1.6.081218TC","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

0 commit comments

Comments
 (0)