Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build #27

Open
wants to merge 4 commits into
base: update-yaml-files
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Expand Down
1 change: 0 additions & 1 deletion SmsVerification/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@
.externalNativeBuild
sensitive.xml
debug.keystore
app/google-services.json
1 change: 1 addition & 0 deletions SmsVerification/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ the HTTP endpoint the app uses to send the SMS). The format is:
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="server_client_secret">0000000000</string>
<string name="server_client_secret_v8">0000000000</string>
<string name="url_verify">https://your-server.com/api/verify</string>
<string name="url_request">https://your-server.com/api/request</string>
<string name="url_reset">https://your-server.com/api/reset</string>
Expand Down
27 changes: 14 additions & 13 deletions SmsVerification/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ android {
debug {
// Note: mutual dependency between this file, and SMS generated by
// server. (See README.md.)
storeFile file('../debug.keystore')
if (new File('../debug.keystore').exists()) {
storeFile file('../debug.keystore')
}
}
}

Expand All @@ -35,21 +37,20 @@ repositories {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.volley:volley:1.0.0'
compile 'com.android.support:design:25.3.1'
compile 'com.google.android.gms:play-services-base:11.0.1'
compile 'com.google.android.gms:play-services-identity:11.0.1'
compile 'com.google.android.gms:play-services-auth:11.0.1'
compile 'com.google.android.gms:play-services-auth-api-phone:11.0.1'
compile 'com.android.support:support-v4:25.3.1'
testCompile 'junit:junit:4.12'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.volley:volley:1.1.0'
implementation 'com.android.support:design:25.3.1'
implementation 'com.google.android.gms:play-services-base:11.0.1'
implementation 'com.google.android.gms:play-services-identity:11.0.1'
implementation 'com.google.android.gms:play-services-auth:11.0.1'
implementation 'com.google.android.gms:play-services-auth-api-phone:11.0.1'
implementation 'com.android.support:support-v4:25.3.1'
testImplementation 'junit:junit:4.12'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
}

apply plugin: 'com.google.gms.google-services'
59 changes: 59 additions & 0 deletions SmsVerification/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"project_info": {
"project_number": "0000000000",
"firebase_url": "https://xxxxxxxxx.firebaseio.com",
"project_id": "xxxxxxxxxxx",
"storage_bucket": "xxxxxxxxxxxxx"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:000000000:android:fake_mobile_sdk_app_id",
"android_client_info": {
"package_name": "com.google.samples.smartlock.sms_verify"
}
},
"oauth_client": [
{
"client_id": "fake_client_id.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "fake_client_id.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.google.samples.smartlock.sms_verify",
"certificate_hash": "fake_certificate_hash"
}
},
{
"client_id": "fake_client_id.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "fake_current_key"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "fake_client_id.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
6 changes: 6 additions & 0 deletions SmsVerification/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@
<string name="verifier_server_response">Server sent SMS</string>
<string name="verifying_text">Verifying SMS</string>
<string name="menu_reset_verification_title">Reset Verification</string>

<string name="server_client_secret">0000000000</string>
<string name="server_client_secret_v8">0000000000</string>
<string name="url_verify">https://your-server.com/api/verify</string>
<string name="url_request">https://your-server.com/api/request</string>
<string name="url_reset">https://your-server.com/api/reset</string>
</resources>
4 changes: 3 additions & 1 deletion SmsVerification/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.google.gms:google-services:3.0.0' // provides com.google.gms.google-services plugin

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -15,6 +16,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions SmsVerification/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed May 03 18:24:44 BST 2017
#Wed Sep 25 14:30:25 JST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip