diff --git a/app/build.gradle b/app/build.gradle index 406e40c..da411e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,16 +2,16 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 33 defaultConfig { applicationId "com.google.ar.core.codelabs.hellogeospatial" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 30 - versionCode 1 - versionName '1.0' + targetSdkVersion 33 + versionCode 2 + versionName '1.1' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -30,21 +30,21 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.31.0' + implementation 'com.google.ar:core:1.34.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj implementation 'de.javagl:obj:0.2.1' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1' - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.7.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'com.google.android.gms:play-services-auth:20+' - implementation 'com.google.android.gms:play-services-location:19+' - implementation 'com.google.android.gms:play-services-maps:18.0.2' + implementation 'com.google.android.gms:play-services-auth:20.3.0' + implementation 'com.google.android.gms:play-services-location:21.0.1' + implementation 'com.google.android.gms:play-services-maps:18.1.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3966cfc..bd23ca6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,6 +20,7 @@ + @@ -29,7 +30,6 @@ { installRequested = true // tryCreateSession will be called again, so we return null for now. diff --git a/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/GeoPermissionsHelper.kt b/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/GeoPermissionsHelper.kt index 1712924..7bdb234 100644 --- a/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/GeoPermissionsHelper.kt +++ b/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/GeoPermissionsHelper.kt @@ -26,7 +26,11 @@ import androidx.core.content.ContextCompat /** Helper to ask camera permission. */ object GeoPermissionsHelper { - private val PERMISSIONS = arrayOf(Manifest.permission.CAMERA, Manifest.permission.ACCESS_FINE_LOCATION) + private val PERMISSIONS = arrayOf( + Manifest.permission.CAMERA, + Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION + ) /** Check to see we have the necessary permissions for this app. */ fun hasGeoPermissions(activity: Activity): Boolean { @@ -53,4 +57,4 @@ object GeoPermissionsHelper { intent.data = Uri.fromParts("package", activity.packageName, null) activity.startActivity(intent) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/MapView.kt b/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/MapView.kt index 639d8ae..baa5482 100644 --- a/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/MapView.kt +++ b/app/src/main/java/com/google/ar/core/codelabs/hellogeospatial/helpers/MapView.kt @@ -90,7 +90,7 @@ class MapView(val activity: HelloGeoActivity, val googleMap: GoogleMap) { color: Int, ): Marker { val markersOptions = MarkerOptions() - .position(LatLng(0.0,0.0)) + .position(LatLng(0.0, 0.0)) .draggable(false) .anchor(0.5f, 0.5f) .flat(true) @@ -110,4 +110,4 @@ class MapView(val activity: HelloGeoActivity, val googleMap: GoogleMap) { canvas.drawBitmap(navigationIcon, /* left= */0f, /* top= */0f, p) return navigationIcon } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 602b719..fe0f7d8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.7.20' repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.1" + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57b1b7c..c389b99 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip