From a8796626592dc499c161b831bebc8d2393900567 Mon Sep 17 00:00:00 2001 From: ThomasGorisse Date: Fri, 16 Apr 2021 11:37:34 +0200 Subject: [PATCH] Fix Duplicate BuildConfig Fix #35 Fix #36 --- README.md | 2 +- core/build.gradle | 4 ++-- docs/index.md | 2 +- gradle.properties | 2 +- sceneform/build.gradle | 4 ++-- sceneform/src/main/AndroidManifest.xml | 2 +- ux/build.gradle | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 06dbcba5..82549835 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ apps without requiring OpenGL or Unity. *app/build.gradle* ```gradle dependencies { - implementation("com.gorisse.thomas.sceneform:sceneform:1.18.8") + implementation("com.gorisse.thomas.sceneform:sceneform:1.18.9") } ``` **[more...](https://thomasgorisse.github.io/sceneform-android-sdk/dependencies)** diff --git a/core/build.gradle b/core/build.gradle index 04fc107f..d771e3a7 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -6,8 +6,8 @@ android { // Sceneform requires minSdkVersion >= 24. minSdkVersion 24 targetSdkVersion 30 - versionCode 6 - versionName "1.18.8" + versionCode 7 + versionName "1.18.9" } compileOptions { // Sceneform libraries use language constructs from Java 8. diff --git a/docs/index.md b/docs/index.md index 3a59f007..a11f5abc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -27,7 +27,7 @@ apps without requiring OpenGL or Unity. *app/build.gradle* ```gradle dependencies { - implementation("com.gorisse.thomas.sceneform:sceneform:1.18.8") + implementation("com.gorisse.thomas.sceneform:sceneform:1.18.9") } ``` **[more...](https://thomasgorisse.github.io/sceneform-android-sdk/dependencies)** diff --git a/gradle.properties b/gradle.properties index c2f643bd..d1a689d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx2048M" # Maven Publish ############### GROUP=com.gorisse.thomas.sceneform -VERSION_NAME=1.18.8 +VERSION_NAME=1.18.9 POM_DESCRIPTION=Sceneform is a 3D framework with a physically based renderer that is optimized for mobile devices and that makes it easy for you to build Augmented Reality (AR) apps without requiring OpenGL or Unity. POM_URL=https://github.com/thomasgorisse/sceneform-android-sdk POM_SCM_URL=https://github.com/thomasgorisse/sceneform-android-sdk diff --git a/sceneform/build.gradle b/sceneform/build.gradle index 87df8c92..beb47dd6 100644 --- a/sceneform/build.gradle +++ b/sceneform/build.gradle @@ -5,8 +5,8 @@ android { defaultConfig { minSdkVersion 24 targetSdkVersion 30 - versionCode 6 - versionName "1.18.8" + versionCode 7 + versionName "1.18.9" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/sceneform/src/main/AndroidManifest.xml b/sceneform/src/main/AndroidManifest.xml index 03bd12a3..229a5775 100644 --- a/sceneform/src/main/AndroidManifest.xml +++ b/sceneform/src/main/AndroidManifest.xml @@ -16,5 +16,5 @@ --> + package="com.google.ar.sceneform.sceneform"> diff --git a/ux/build.gradle b/ux/build.gradle index 45a6d8e9..834904b4 100644 --- a/ux/build.gradle +++ b/ux/build.gradle @@ -6,8 +6,8 @@ android { // Sceneform requires minSdkVersion >= 24. minSdkVersion 24 targetSdkVersion 30 - versionCode 6 - versionName "1.18.8" + versionCode 7 + versionName "1.18.9" } compileOptions { // Sceneform libraries use language constructs from Java 8.