Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SDK versions to build material-showcase in modern dev environments #705

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update SDK versions to build material-showcase in modern dev environments #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07a940
Mirror the commit https://github.com/googlesamples/mlkit/commit/8b31d…
miworking May 2, 2023
c8f1f9b
Update SDK versions to build
PaulKlauser Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions android/material-showcase/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion android/material-showcase/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.mlkit.md"
android:installLocation="auto">

<uses-feature android:name="android.hardware.camera"/>
Expand Down
6 changes: 3 additions & 3 deletions android/material-showcase/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// 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()
mavenLocal()

}
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"
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/material-showcase/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ios/quickstarts/vision/VisionExample/UIUtilities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down