diff --git a/ARCore-Integration-Java/app/build.gradle b/ARCore-Integration-Java/app/build.gradle index ad3c01f0..6d62d3d7 100644 --- a/ARCore-Integration-Java/app/build.gradle +++ b/ARCore-Integration-Java/app/build.gradle @@ -16,7 +16,6 @@ sceneform.asset( android { compileSdkVersion extCompileSdkVersion - buildToolsVersion extBuildToolsVersion defaultConfig { applicationId "com.tokbox.sample.arcoreintegration" diff --git a/ARCore-Integration-Java/app/src/main/AndroidManifest.xml b/ARCore-Integration-Java/app/src/main/AndroidManifest.xml index a9a913b8..f457e46d 100644 --- a/ARCore-Integration-Java/app/src/main/AndroidManifest.xml +++ b/ARCore-Integration-Java/app/src/main/AndroidManifest.xml @@ -12,7 +12,8 @@ + android:screenOrientation="portrait" + android:exported="true"> diff --git a/ARCore-Integration-Java/build.gradle b/ARCore-Integration-Java/build.gradle index bfa09b1f..0ccd671e 100644 --- a/ARCore-Integration-Java/build.gradle +++ b/ARCore-Integration-Java/build.gradle @@ -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 +} \ No newline at end of file diff --git a/ARCore-Integration-Java/gradle.properties b/ARCore-Integration-Java/gradle.properties index ff61565f..a48987c4 100644 --- a/ARCore-Integration-Java/gradle.properties +++ b/ARCore-Integration-Java/gradle.properties @@ -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 diff --git a/ARCore-Integration-Java/gradle/wrapper/gradle-wrapper.properties b/ARCore-Integration-Java/gradle/wrapper/gradle-wrapper.properties index ba132596..f4a84037 100644 --- a/ARCore-Integration-Java/gradle/wrapper/gradle-wrapper.properties +++ b/ARCore-Integration-Java/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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip diff --git a/ARCore-Integration-Java/settings.gradle b/ARCore-Integration-Java/settings.gradle index 21c488eb..208fa9e7 100644 --- a/ARCore-Integration-Java/settings.gradle +++ b/ARCore-Integration-Java/settings.gradle @@ -1 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + include ':app', ':ScreenSharing'