Skip to content

Commit 8e20c72

Browse files
DellaBittaDellaBitta
authored
Update Android build config and source fixes (#102)
A pass of the android build process to ensure the testapps can build prior to adding CI to the repo.
1 parent fa6ffee commit 8e20c72

File tree

22 files changed

+137
-100
lines changed

22 files changed

+137
-100
lines changed

Diff for: ‎admob/testapp/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -36,7 +36,7 @@ android {
3636

3737
defaultConfig {
3838
applicationId 'com.google.android.admob.testapp'
39-
minSdkVersion 16
39+
minSdkVersion 26
4040
targetSdkVersion 28
4141
versionCode 1
4242
versionName '1.0'

Diff for: ‎admob/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎analytics/testapp/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

@@ -36,7 +40,7 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.android.analytics.testapp'
39-
minSdkVersion 16
43+
minSdkVersion 19
4044
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'

Diff for: ‎analytics/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎analytics/testapp/src/common_main.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
6363
// Set the user ID.
6464
analytics::SetUserId("uber_user_510");
6565

66-
LogMessage("Set current screen.");
67-
// Set the user's current screen.
68-
analytics::SetCurrentScreen("Firebase Analytics C++ testapp", "testapp");
66+
LogMessage("Log current screen.");
67+
// Log the user's current screen.
68+
analytics::LogEvent(analytics::kEventScreenView, "Firebase Analytics C++ testapp", "testapp" );
6969

7070
// Log an event with no parameters.
7171
LogMessage("Log login event.");

Diff for: ‎auth/testapp/build.gradle

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,6 +22,11 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
29+
2530
compileSdkVersion 28
2631
buildToolsVersion '28.0.3'
2732

@@ -36,7 +41,7 @@ android {
3641

3742
defaultConfig {
3843
applicationId 'com.google.android.auth.testapp'
39-
minSdkVersion 16
44+
minSdkVersion 19
4045
targetSdkVersion 28
4146
versionCode 1
4247
versionName '1.0'

Diff for: ‎auth/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎database/testapp/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,6 +22,10 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

@@ -36,7 +40,7 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.firebase.cpp.database.testapp'
39-
minSdkVersion 16
43+
minSdkVersion 19
4044
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'

Diff for: ‎database/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎dynamic_links/testapp/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

@@ -36,7 +40,7 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.android.dynamiclinks.testapp'
39-
minSdkVersion 16
43+
minSdkVersion 19
4044
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'

Diff for: ‎dynamic_links/testapp/gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
7+

Diff for: ‎firestore/testapp/build.gradle

+9-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,8 +22,12 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 29
26-
buildToolsVersion "29.0.0"
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
29+
compileSdkVersion 28
30+
buildToolsVersion "28.0.3"
2731

2832
sourceSets {
2933
main {
@@ -36,8 +40,8 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.firebase.cpp.firestore.testapp'
39-
minSdkVersion 16
40-
targetSdkVersion 29
43+
minSdkVersion 19
44+
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'
4347
externalNativeBuild.cmake {

Diff for: ‎firestore/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎functions/testapp/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,6 +22,10 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

@@ -36,7 +40,7 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.firebase.cpp.functions.testapp'
39-
minSdkVersion 16
43+
minSdkVersion 19
4044
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'

Diff for: ‎functions/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎messaging/testapp/build.gradle

+6-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,16 +22,13 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

28-
android {
29-
compileOptions {
30-
sourceCompatibility 1.8
31-
targetCompatibility 1.8
32-
}
33-
}
34-
3532
sourceSets {
3633
main {
3734
jniLibs.srcDirs = ['libs']
@@ -43,7 +40,7 @@ android {
4340

4441
defaultConfig {
4542
applicationId 'com.google.android.messaging.testapp'
46-
minSdkVersion 16
43+
minSdkVersion 19
4744
targetSdkVersion 28
4845
versionCode 1
4946
versionName '1.0'

Diff for: ‎messaging/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

Diff for: ‎remote_config/testapp/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.3.3'
1010
classpath 'com.google.gms:google-services:4.0.1'
1111
}
1212
}
@@ -22,6 +22,10 @@ allprojects {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25+
compileOptions {
26+
sourceCompatibility 1.8
27+
targetCompatibility 1.8
28+
}
2529
compileSdkVersion 28
2630
buildToolsVersion '28.0.3'
2731

@@ -36,7 +40,7 @@ android {
3640

3741
defaultConfig {
3842
applicationId 'com.google.android.remoteconfig.testapp'
39-
minSdkVersion 16
43+
minSdkVersion 19
4044
targetSdkVersion 28
4145
versionCode 1
4246
versionName '1.0'

Diff for: ‎remote_config/testapp/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)