Jumbling of dependencies, no progress

JakeSteam · Aug 27, 2023 · 59eb12f · 59eb12f
1 parent 646e8f1
commit 59eb12f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/BaseGameUtils/build.gradle b/BaseGameUtils/build.gradle
@@ -6,6 +6,7 @@ buildscript {
         maven {
             url 'https://maven.google.com'
         }
+        google()
     }
 
     dependencies {
@@ -21,7 +22,7 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 28
     buildToolsVersion compilerVersion
 }
 
diff --git a/Blacksmith/build.gradle b/Blacksmith/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 28
     buildToolsVersion '25.0.0'
 
     defaultConfig {
@@ -28,6 +28,7 @@ repositories {
     maven {
         url 'https://maven.google.com'
     }
+    google()
 }
 
 dependencies {
@@ -36,7 +37,7 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:percent:$supportLibraryVersion"
-    implementation "com.google.android.gms:play-services-ads:$playLibraryVersion"
+    implementation "com.google.android.gms:play-services-ads:20.0.0"
     implementation "com.google.android.gms:play-services-gcm:$playLibraryVersion"
     implementation 'com.github.satyan:sugar:1.5'
     implementation 'com.google.code.gson:gson:2.7'

diff --git a/Blacksmith/src/main/AndroidManifest.xml b/Blacksmith/src/main/AndroidManifest.xml
@@ -55,7 +55,8 @@
         <!--suppress AndroidDomInspection -->
         <activity
             android:name=".main.SplashScreenActivity"
-            android:theme="@style/AppTheme.Splash">
+            android:theme="@style/AppTheme.Splash"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -153,7 +154,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppTheme.PopupOverlay" />
 
-        <receiver android:name=".helper.NotificationHelper">
+        <receiver android:name=".helper.NotificationHelper" android:exported="true">
             <intent-filter>
                 <action android:name="android.media.action.DISPLAY_NOTIFICATION" />
 

diff --git a/Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/MainActivity.java b/Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/MainActivity.java
@@ -19,10 +19,6 @@
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.drive.Drive;
-import com.google.android.gms.games.Games;
-import com.google.android.gms.games.quest.Quest;
-import com.google.android.gms.games.quest.QuestUpdateListener;
 import com.orm.query.Condition;
 import com.orm.query.Select;
 import com.tapjoy.TJPlacement;

diff --git a/build.gradle b/build.gradle
@@ -16,8 +16,8 @@ buildscript {
 ext {
     apiVersion = 33
     compilerVersion = '25.0.1'
-    supportLibraryVersion = '23.0.1' // Updating this breaks alert sizes, tutorial skipping, and many other things. Don't.
-    playLibraryVersion = '15.0.0'
+    supportLibraryVersion = '28.0.0' // Updating this breaks alert sizes, tutorial skipping, and many other things. Don't.
+    playLibraryVersion = '12.0.1'
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.useAndroidX=true