Skip to content

Commit

Permalink
Updated ARCore Java to latest Android API, SDK and gradle configs
Browse files Browse the repository at this point in the history
  • Loading branch information
devwithzachary committed Apr 5, 2022
1 parent 72a5acc commit c162d4e
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 34 deletions.
1 change: 0 additions & 1 deletion ARCore-Integration-Java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ sceneform.asset(

android {
compileSdkVersion extCompileSdkVersion
buildToolsVersion extBuildToolsVersion

defaultConfig {
applicationId "com.tokbox.sample.arcoreintegration"
Expand Down
3 changes: 2 additions & 1 deletion ARCore-Integration-Java/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

<activity
android:name=".MainActivity"
android:screenOrientation="portrait">
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
37 changes: 7 additions & 30 deletions ARCore-Integration-Java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
apply {
from '../commons.gradle'
}

repositories {
google()
mavenCentral()

// Not all libraries are migrated to mavenCentral. We need to keep jcenter for now
jcenter()
}
dependencies {
// Dependency versions are defined in the ../commons.gradle file
classpath "com.android.tools.build:gradle:${extAgpVersion}"
classpath 'com.google.ar.sceneform:plugin:1.17.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
plugins {
id 'com.android.application' version '7.1.2' apply false
id 'com.android.library' version '7.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
}

allprojects {
repositories {
google()
mavenCentral()

// Not all libraries are migrated to mavenCentral. We need to keep jcenter for now
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion ARCore-Integration-Java/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m
org.gradle.jvmargs=-Xmx4096m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
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-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
15 changes: 15 additions & 0 deletions ARCore-Integration-Java/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}

include ':app', ':ScreenSharing'

0 comments on commit c162d4e

Please sign in to comment.