Skip to content

Upgrade AGP to 8.13.2 and modernize build configuration #348

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.

Sign up for GitHub

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

Open
tergel93 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade AGP to 8.13.2 and modernize build configuration #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions CollectAllTheStars2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ android {

compileSdkVersion android_compile_version

namespace "com.google.example.games.tanc"

defaultConfig {
/*
TODO: Replace this value with your application's package name
Expand All @@ -17,6 +19,11 @@ android {
versionName "1.0"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildTypes {
release {
minifyEnabled true
Expand All @@ -32,8 +39,3 @@ dependencies {
implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
}

buildscript {
repositories {
jcenter()
}
}
13 changes: 7 additions & 6 deletions TypeANumber/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ android {

compileSdkVersion android_compile_version

namespace "com.google.example.games.tanc"

defaultConfig {
/*
TODO: Replace this value with your application's package name
Expand All @@ -17,6 +19,11 @@ android {
versionName "1.0"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildTypes {
release {
minifyEnabled true
Expand All @@ -34,9 +41,3 @@ dependencies {
implementation "com.google.android.gms:play-services-games:20.0.1"
implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
}

buildscript {
repositories {
jcenter()
}
}
3 changes: 1 addition & 2 deletions TypeANumber/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
-->


<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.example.games.tanc">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">


<application
Expand Down
29 changes: 13 additions & 16 deletions TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,26 +93,23 @@ private void updateUI() {

@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.digit_button_clear:
final int id = view.getId();
if (id == R.id.digit_button_clear) {
setScore(0);
break;
case R.id.digit_button_0:
case R.id.digit_button_1:
case R.id.digit_button_2:
case R.id.digit_button_3:
case R.id.digit_button_4:
case R.id.digit_button_5:
case R.id.digit_button_6:
case R.id.digit_button_7:
case R.id.digit_button_8:
case R.id.digit_button_9:
} else if (id == R.id.digit_button_0
|| id == R.id.digit_button_1
|| id == R.id.digit_button_2
|| id == R.id.digit_button_3
|| id == R.id.digit_button_4
|| id == R.id.digit_button_5
|| id == R.id.digit_button_6
|| id == R.id.digit_button_7
|| id == R.id.digit_button_8
|| id == R.id.digit_button_9) {
int x = Integer.parseInt(((Button) view).getText().toString().trim());
setScore((mRequestedScore * 10 + x) % 10000);
break;
case R.id.ok_score_button:
} else if (id == R.id.ok_score_button) {
mCallback.onEnteredScore(mRequestedScore);
break;
}
}
}
38 changes: 16 additions & 22 deletions TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,22 @@ private void updateUI() {

@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.easy_mode_button:
mListener.onStartGameRequested(false);
break;
case R.id.hard_mode_button:
mListener.onStartGameRequested(true);
break;
case R.id.show_achievements_button:
mListener.onShowAchievementsRequested();
break;
case R.id.show_leaderboards_button:
mListener.onShowLeaderboardsRequested();
break;
case R.id.show_friends_button:
mListener.onShowFriendsButtonClicked();
break;
case R.id.sign_in_button:
mListener.onSignInButtonClicked();
break;
case R.id.sign_out_button:
mListener.onSignOutButtonClicked();
break;
final int id = view.getId();

if (id == R.id.easy_mode_button) {
mListener.onStartGameRequested(false);
} else if (id == R.id.hard_mode_button) {
mListener.onStartGameRequested(true);
} else if (id == R.id.show_achievements_button) {
mListener.onShowAchievementsRequested();
} else if (id == R.id.show_leaderboards_button) {
mListener.onShowLeaderboardsRequested();
} else if (id == R.id.show_friends_button) {
mListener.onShowFriendsButtonClicked();
} else if (id == R.id.sign_in_button) {
mListener.onSignInButtonClicked();
} else if (id == R.id.sign_out_button) {
mListener.onSignOutButtonClicked();
}
}

Expand Down
12 changes: 5 additions & 7 deletions TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,11 @@ private void updateUI() {

@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.win_screen_sign_in_button:
mListener.onSignInButtonClicked();
break;
case R.id.win_ok_button:
mListener.onWinScreenDismissed();
break;
final int id = view.getId();
if (id == R.id.win_screen_sign_in_button) {
mListener.onSignInButtonClicked();
} else if (id == R.id.win_ok_button) {
mListener.onWinScreenDismissed();
}
}

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:8.13.2'
}
}

// allprojects apply to every project
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}

ext {
android_compile_version = 28
android_compile_version = 30

// Google Play Services minimum requirements is 14
android_min_sdk_version = 14
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 31 16:24:33 BST 2020
#Tue Mar 31 23:52:31 SGT 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip