Skip to content

Commit 16bbe32

Browse files
committed
Update open source build to target sdk version 28, and remove annotations
Updated the open source build for Android to target sdk version 28, for the new androidx dependencies, and remove annotations, since those changed based on the android support library vs androidx, which complicated the build unnecessarily. PiperOrigin-RevId: 255515435
1 parent 3e67c5b commit 16bbe32

File tree

20 files changed

+33
-35
lines changed

20 files changed

+33
-35
lines changed

admob/admob_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35-
compileSdkVersion 26
35+
compileSdkVersion 28
3636

3737
sourceSets {
3838
main {

admob/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 26
34+
compileSdkVersion 28
3535
buildToolsVersion '28.0.3'
3636

3737
sourceSets {
@@ -49,7 +49,7 @@ android {
4949
defaultConfig {
5050
// This is the platform API where NativeActivity was introduced.
5151
minSdkVersion 9
52-
targetSdkVersion 26
52+
targetSdkVersion 28
5353
versionCode 1
5454
versionName "1.0"
5555

analytics/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 26
34+
compileSdkVersion 28
3535
buildToolsVersion '28.0.3'
3636

3737
sourceSets {
@@ -49,7 +49,7 @@ android {
4949
defaultConfig {
5050
// This is the platform API where NativeActivity was introduced.
5151
minSdkVersion 9
52-
targetSdkVersion 26
52+
targetSdkVersion 28
5353
versionCode 1
5454
versionName "1.0"
5555

app/app_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35-
compileSdkVersion 26
35+
compileSdkVersion 28
3636

3737
sourceSets {
3838
main {

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 26
34+
compileSdkVersion 28
3535
buildToolsVersion '28.0.3'
3636

3737
sourceSets {
@@ -49,7 +49,7 @@ android {
4949
defaultConfig {
5050
// This is the platform API where NativeActivity was introduced.
5151
minSdkVersion 9
52-
targetSdkVersion 26
52+
targetSdkVersion 28
5353
versionCode 1
5454
versionName "1.0"
5555

app/google_api_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35-
compileSdkVersion 26
35+
compileSdkVersion 28
3636

3737
sourceSets {
3838
main {

app/invites_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35-
compileSdkVersion 26
35+
compileSdkVersion 28
3636

3737
sourceSets {
3838
main {

app/src_java/com/google/firebase/invites/internal/cpp/AppInviteNativeWrapper.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import android.content.Intent;
2525
import android.net.Uri;
2626
import android.os.Bundle;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
2927
import com.google.android.gms.appinvite.AppInvite;
3028
import com.google.android.gms.appinvite.AppInviteInvitation;
3129
import com.google.android.gms.appinvite.AppInviteInvitationResult;
@@ -180,7 +178,7 @@ public void discardNativePointer() {
180178
}
181179

182180
@Override
183-
public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
181+
public void onConnectionFailed(ConnectionResult connectionResult) {
184182
/* do something with the error...? */
185183
safeConnectionFailedCallback(
186184
nativeInternalPtr, connectionResult.getErrorCode(), connectionResult.getErrorMessage());
@@ -439,7 +437,7 @@ public void gotInvitationResult(String[] invitationIDs, int resultCode, String e
439437
boolean waitingToFetchInvites = false;
440438

441439
@Override
442-
public void onConnected(@Nullable Bundle bundle) {
440+
public void onConnected(Bundle bundle) {
443441
activity.runOnUiThread(
444442
new Runnable() {
445443
@Override
@@ -475,7 +473,7 @@ void finishPendingFetchInvite() {
475473
.setResultCallback(
476474
new ResultCallback<AppInviteInvitationResult>() {
477475
@Override
478-
public void onResult(@NonNull AppInviteInvitationResult result) {
476+
public void onResult(AppInviteInvitationResult result) {
479477
Log.d(TAG, "getInvitation:onResult:" + result.getStatus());
480478
Intent invitation = result.getInvitationIntent();
481479
if (invitation != null && AppInviteReferral.hasReferral(invitation)) {
@@ -558,7 +556,7 @@ public void run() {
558556
.setResultCallback(
559557
new ResultCallback<Status>() {
560558
@Override
561-
public void onResult(@NonNull Status status) {
559+
public void onResult(Status status) {
562560
Log.d(TAG, "convertInvitation:onResult:" + status);
563561
if (status.isSuccess()) {
564562
safeConvertedInviteCallback(

auth/auth_resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ allprojects {
3232
apply plugin: 'com.android.library'
3333

3434
android {
35-
compileSdkVersion 26
35+
compileSdkVersion 28
3636

3737
sourceSets {
3838
main {

auth/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ allprojects {
3131
apply plugin: 'com.android.library'
3232

3333
android {
34-
compileSdkVersion 26
34+
compileSdkVersion 28
3535
buildToolsVersion '28.0.3'
3636

3737
sourceSets {
@@ -49,7 +49,7 @@ android {
4949
defaultConfig {
5050
// This is the platform API where NativeActivity was introduced.
5151
minSdkVersion 9
52-
targetSdkVersion 26
52+
targetSdkVersion 28
5353
versionCode 1
5454
versionName "1.0"
5555

0 commit comments

Comments
 (0)