Skip to content

Commit 299d08b

Browse files
morbo84morbo84
committed
prepared for billings
1 parent 215e58d commit 299d08b

File tree

7 files changed

+34
-15
lines changed

7 files changed

+34
-15
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ gradle
1313
gradlew
1414
gradlew.bat
1515
local.properties
16+
keystore.properties

‎app/app.iml

+8-10
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
194194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
195195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
196-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
197196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
198197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
199198
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
@@ -209,7 +208,6 @@
209208
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
210209
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
211210
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
212-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
213211
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
214212
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
215213
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
@@ -220,35 +218,35 @@
220218
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-drive-15.0.0" level="project" />
221219
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
222220
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
221+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
223222
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.0" level="project" />
223+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
224+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
224225
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
225-
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
226226
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
227-
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
228227
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.0" level="project" />
229228
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
230229
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
231-
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
232-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
230+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
231+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
233232
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
234233
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.0" level="project" />
235-
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
236234
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
237-
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
235+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
238236
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-15.0.0" level="project" />
239237
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
240238
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.0" level="project" />
241239
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-oss-licenses-15.0.0" level="project" />
242240
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier-15.0.0" level="project" />
243241
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
244242
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
245-
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
243+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
246244
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
247245
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
248246
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
249247
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
250248
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-games-15.0.0" level="project" />
251-
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
249+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
252250
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.0" level="project" />
253251
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
254252
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />

‎app/build.gradle

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'com.google.gms.oss.licenses.plugin'
33

4+
5+
// Load keystore
6+
def keystorePropertiesFile = rootProject.file("keystore.properties");
7+
def keystoreProperties = new Properties()
8+
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
9+
10+
411
android {
512
compileSdkVersion 27
613
buildToolsVersion "27.0.3"
714
defaultConfig {
815
applicationId "com.gamee.facesmash"
916
minSdkVersion 21
1017
targetSdkVersion 27
11-
versionCode 1
18+
versionCode 4
1219
versionName "1.0"
1320
ndk {
1421
abiFilters 'armeabi-v7a'
@@ -21,17 +28,25 @@ android {
2128
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2229
}
2330
signingConfigs{
24-
debug{
31+
debug {
2532
keyAlias 'androiddebugkey'
2633
keyPassword 'android'
2734
storeFile file('debug.keystore')
2835
storePassword 'android'
2936
}
37+
release {
38+
storeFile file(keystoreProperties['storeFile'])
39+
storePassword keystoreProperties['storePassword']
40+
keyAlias keystoreProperties['keyAlias']
41+
keyPassword keystoreProperties['keyPassword']
42+
v2SigningEnabled true
43+
}
3044
}
3145
buildTypes {
3246
release {
3347
minifyEnabled false
3448
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
49+
signingConfig signingConfigs.release
3550
}
3651
debug{
3752
signingConfig signingConfigs.debug
@@ -61,5 +76,5 @@ dependencies {
6176
implementation 'com.google.android.gms:play-services-nearby:15.0.0'
6277
implementation 'com.google.android.gms:play-services-oss-licenses:15.0.0'
6378
// needed by the gms oss-licenses
64-
implementation 'com.android.support:appcompat-v7:27.1.0'
79+
implementation 'com.android.support:appcompat-v7:27.1.1'
6580
}

‎app/jni/src/Android.mk

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ LOCAL_SRC_FILES := \
5050
$(FACESMASH_SRC_DIR)/service/audio_sdl.cpp \
5151
$(FACESMASH_SRC_DIR)/service/av_recorder_android.cpp \
5252
$(FACESMASH_SRC_DIR)/service/av_recorder_null.cpp \
53+
$(FACESMASH_SRC_DIR)/service/billing_android.cpp \
54+
$(FACESMASH_SRC_DIR)/service/billing_null.cpp \
5355
$(FACESMASH_SRC_DIR)/service/camera_android.cpp \
5456
$(FACESMASH_SRC_DIR)/service/camera_null.cpp \
5557
$(FACESMASH_SRC_DIR)/service/face_bus_service.cpp \

‎app/jni/src/facesmash-sources

Submodule facesmash-sources updated from 0c98311 to ff9277e

‎app/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<uses-feature android:name="android.hardware.camera" />
1616
<uses-feature android:name="android.hardware.camera.front"/>
1717
<uses-feature android:name="android.hardware.camera.autofocus" />
18+
<uses-permission android:name="com.android.vending.BILLING" />
19+
1820

1921
<!-- if you want to capture audio, uncomment this. -->
2022
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->

‎build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
google()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.1'
12+
classpath 'com.android.tools.build:gradle:3.1.2'
1313
classpath 'com.google.gms:oss-licenses:0.9.1'
1414

1515
// NOTE: Do not place your application dependencies here; they belong
@@ -23,6 +23,7 @@ allprojects {
2323
maven {
2424
url "https://maven.google.com"
2525
}
26+
google()
2627
}
2728
}
2829

0 commit comments

Comments
 (0)