diff --git a/android/material-showcase/app/build.gradle b/android/material-showcase/app/build.gradle index cd8be74044..0ee5cfb6e8 100644 --- a/android/material-showcase/app/build.gradle +++ b/android/material-showcase/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-parcelize' android { - compileSdkVersion 31 + namespace 'com.google.mlkit.md' + compileSdk 33 defaultConfig { applicationId "com.google.mlkit.md" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -38,10 +39,6 @@ android { } } -androidExtensions { - experimental = true -} - dependencies { implementation 'com.android.volley:volley:1.2.1' implementation 'com.google.android.material:material:1.4.0' diff --git a/android/material-showcase/app/src/main/AndroidManifest.xml b/android/material-showcase/app/src/main/AndroidManifest.xml index 493e2e634a..db510a2c3f 100644 --- a/android/material-showcase/app/src/main/AndroidManifest.xml +++ b/android/material-showcase/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ diff --git a/android/material-showcase/build.gradle b/android/material-showcase/build.gradle index 72fbe0c040..b28bd6caa1 100644 --- a/android/material-showcase/build.gradle +++ b/android/material-showcase/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = '1.8.20' repositories { google() jcenter() @@ -9,8 +9,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" + classpath 'com.android.tools.build:gradle:8.0.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20" } } diff --git a/android/material-showcase/gradle/wrapper/gradle-wrapper.properties b/android/material-showcase/gradle/wrapper/gradle-wrapper.properties index 7f975cbe9d..b01a8d7938 100644 --- a/android/material-showcase/gradle/wrapper/gradle-wrapper.properties +++ b/android/material-showcase/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.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/ios/quickstarts/vision/VisionExample/UIUtilities.swift b/ios/quickstarts/vision/VisionExample/UIUtilities.swift index 26089279b4..f53bd747ff 100644 --- a/ios/quickstarts/vision/VisionExample/UIUtilities.swift +++ b/ios/quickstarts/vision/VisionExample/UIUtilities.swift @@ -451,7 +451,7 @@ public class UIUtilities { /// /// - Parameters: /// - fromPoint: The starting point. - /// - endPoint: The end point. + /// - toPoint: The end point. /// - Returns: The distance. private static func distance(fromPoint: Vision3DPoint, toPoint: Vision3DPoint) -> CGFloat { let xDiff = fromPoint.x - toPoint.x