Release 0.9.2.

build.gradle

@@ -17,9 +17,9 @@ allprojects {
 
 ext {
  minSdkVersion = 19
- targetSdkVersion = 31
+ targetSdkVersion = 33
  versionCode = 11
- versionName = '0.9.1'
+ versionName = '0.9.2'
 }
 
 task clean(type: Delete) {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

worldwind-tutorials/src/main/java/gov/nasa/worldwindx/MainActivity.java

@@ -17,6 +17,7 @@
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
@@ -132,6 +133,17 @@ protected void onCreateDrawer() {
  this.navigationView = findViewById(R.id.nav_view);
  this.navigationView.setNavigationItemSelectedListener(this);
  this.navigationView.setCheckedItem(selectedItemId);
+
+ getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+ @Override
+ public void handleOnBackPressed() {
+ if (drawer.isDrawerOpen(GravityCompat.START)) {
+ drawer.closeDrawer(GravityCompat.START);
+ } else {
+ finish();
+ }
+ }
+ });
  }
 
  @Override
@@ -221,16 +233,6 @@ protected boolean printMetrics() {
  return this.handler.sendEmptyMessageDelayed(PRINT_METRICS, PRINT_METRICS_DELAY);
  }
 
- @Override
- public void onBackPressed() {
- DrawerLayout drawer = findViewById(R.id.drawer_layout);
- if (drawer.isDrawerOpen(GravityCompat.START)) {
- drawer.closeDrawer(GravityCompat.START);
- } else {
- super.onBackPressed();
- }
- }
-
  @Override
  protected void onPostCreate(Bundle savedInstanceState) {
  super.onPostCreate(savedInstanceState);

worldwind/build.gradle

@@ -42,10 +42,10 @@ android {
 }
 
 dependencies {
- implementation 'androidx.annotation:annotation:1.3.0'
+ implementation 'androidx.annotation:annotation:1.4.0'
  implementation 'androidx.appcompat:appcompat-resources:1.4.2'
  testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.mockito:mockito-core:3.12.4'
+ testImplementation 'org.mockito:mockito-core:4.7.0'
  // PowerMockito is required to mock static methods like Logger.log
  testImplementation('org.powermock:powermock-api-mockito2:2.0.9') {
  exclude module: 'hamcrest-core'