Gradle upgrade again. Remove some redundant version checks

(we don't support Android versions older than Gingerbread anyway)
This commit is contained in:
Henrik Rydgård 2022-02-18 14:48:28 +01:00
parent f53d7717ec
commit 7f505c0c23
3 changed files with 6 additions and 12 deletions

View File

@ -451,9 +451,7 @@ public abstract class NativeActivity extends Activity {
sendInitialGrants();
// OK, config should be initialized, we can query for screen rotation.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
updateScreenRotation("Initialize");
}
updateScreenRotation("Initialize");
// Detect OpenGL support.
// We don't currently use this detection for anything but good to have in the log.
@ -835,9 +833,7 @@ public abstract class NativeActivity extends Activity {
}
// OK, config should be initialized, we can query for screen rotation.
if (javaGL || Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
updateScreenRotation("onResume");
}
updateScreenRotation("onResume");
Log.i(TAG, "onResume");
if (javaGL) {
@ -1151,7 +1147,7 @@ public abstract class NativeActivity extends Activity {
}
}
} catch (Exception e) {
Log.w(TAG, "Exception receiving image: " + e.toString());
Log.w(TAG, "Exception receiving image: " + e);
}
} else if (requestCode == RESULT_OPEN_DOCUMENT) {
Uri selectedFile = data.getData();
@ -1466,9 +1462,7 @@ public abstract class NativeActivity extends Activity {
Log.i(TAG, "Must recreate activity on rotation");
}
} else {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
updateScreenRotation("rotate");
}
updateScreenRotation("rotate");
}
} else if (command.equals("sustainedPerfMode")) {
updateSustainedPerformanceMode();

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.1'
}
}

View File

@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
android.useAndroidX=true
android.enableJetifier=true