diff --git a/CollectAllTheStars2/build.gradle b/CollectAllTheStars2/build.gradle
index ac58862..ec4da88 100644
--- a/CollectAllTheStars2/build.gradle
+++ b/CollectAllTheStars2/build.gradle
@@ -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
@@ -17,6 +19,11 @@ android {
         versionName "1.0"
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -32,8 +39,3 @@ dependencies {
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-}
diff --git a/TypeANumber/build.gradle b/TypeANumber/build.gradle
index 0f516a0..c391cf6 100644
--- a/TypeANumber/build.gradle
+++ b/TypeANumber/build.gradle
@@ -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
@@ -17,6 +19,11 @@ android {
         versionName "1.0"
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -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()
-    }
-}
diff --git a/TypeANumber/src/main/AndroidManifest.xml b/TypeANumber/src/main/AndroidManifest.xml
index 4f71aaa..6651a80 100644
--- a/TypeANumber/src/main/AndroidManifest.xml
+++ b/TypeANumber/src/main/AndroidManifest.xml
@@ -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
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
index 6102f58..b819823 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/GameplayFragment.java
@@ -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;
     }
   }
 }
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
index ac7b2ba..e30408d 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/MainMenuFragment.java
@@ -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();
     }
   }
 
diff --git a/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java b/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
index 7d451ac..319b4b4 100644
--- a/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
+++ b/TypeANumber/src/main/java/com/google/example/games/tanc/WinFragment.java
@@ -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();
     }
   }
 
diff --git a/build.gradle b/build.gradle
index 728e805..e409a8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,11 +5,11 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
     }
 }
 
@@ -17,11 +17,11 @@ buildscript {
 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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8a0ae65..2e3de45 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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