From 5e907450bd2cd642b3d1b147c987a39d3255d734 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 24 Jan 2019 08:37:49 +0100 Subject: [PATCH 1/4] Android Studio 3.3 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 6cf3dba0..1918860f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d0b0412..8973a2fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 13 16:09:10 GMT 2017 +#Thu Jan 24 08:32:09 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip From 99ccccdbd459d8f00b6faaaada09056e1cf5c4dd Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 24 Jan 2019 08:38:49 +0100 Subject: [PATCH 2/4] target 28 --- build.gradle | 4 ---- samples/ndk-hellovr/build.gradle | 4 ++-- samples/ndk-hellovrbeta/build.gradle | 4 ++-- samples/sdk-controllerclient/build.gradle | 4 ++-- samples/sdk-hellovr/build.gradle | 4 ++-- samples/sdk-video360/build.gradle | 4 ++-- samples/sdk-videoplayer/build.gradle | 4 ++-- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 1918860f..a4d79c44 100644 --- a/build.gradle +++ b/build.gradle @@ -19,10 +19,6 @@ allprojects { google() // For GVR components, the official source of the .aars is JCenter. jcenter() - maven { - // For Android support library components. - url "https://maven.google.com" - } // You can also use a local Maven repository if desired. mavenLocal() } diff --git a/samples/ndk-hellovr/build.gradle b/samples/ndk-hellovr/build.gradle index 241663b2..3c2fdcf4 100644 --- a/samples/ndk-hellovr/build.gradle +++ b/samples/ndk-hellovr/build.gradle @@ -17,11 +17,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { applicationId "com.google.vr.ndk.samples.hellovr" minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" externalNativeBuild { diff --git a/samples/ndk-hellovrbeta/build.gradle b/samples/ndk-hellovrbeta/build.gradle index 7f1d69e6..42942e5d 100644 --- a/samples/ndk-hellovrbeta/build.gradle +++ b/samples/ndk-hellovrbeta/build.gradle @@ -17,11 +17,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { applicationId "com.google.vr.ndk.samples.hellovrbeta" minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" externalNativeBuild { diff --git a/samples/sdk-controllerclient/build.gradle b/samples/sdk-controllerclient/build.gradle index 73893036..3be76c43 100644 --- a/samples/sdk-controllerclient/build.gradle +++ b/samples/sdk-controllerclient/build.gradle @@ -16,11 +16,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" } diff --git a/samples/sdk-hellovr/build.gradle b/samples/sdk-hellovr/build.gradle index dfb78532..8e6c5b23 100644 --- a/samples/sdk-hellovr/build.gradle +++ b/samples/sdk-hellovr/build.gradle @@ -16,11 +16,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 19 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" } diff --git a/samples/sdk-video360/build.gradle b/samples/sdk-video360/build.gradle index 1e1ddd94..35476291 100644 --- a/samples/sdk-video360/build.gradle +++ b/samples/sdk-video360/build.gradle @@ -16,11 +16,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" } diff --git a/samples/sdk-videoplayer/build.gradle b/samples/sdk-videoplayer/build.gradle index 7395ceb6..32d11fcf 100644 --- a/samples/sdk-videoplayer/build.gradle +++ b/samples/sdk-videoplayer/build.gradle @@ -16,11 +16,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 28 versionCode 1 versionName "1.0" } From 55f3ff07aab55755d61f1acb96ebdd622894933d Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 24 Jan 2019 08:44:36 +0100 Subject: [PATCH 3/4] fix build with Android Studio 3.3 --- settings.gradle | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/settings.gradle b/settings.gradle index 355f4463..5109b0d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,22 +15,4 @@ include ':samples:sdk-videoplayer' //include ':samples:ndk-hellovr' //include ':samples:ndk-hellovrbeta' -// Android Studio doesn't preserve nested modules in its Project View. To create -// a cleaner layout, we reorganize and rename the modules loaded above. -Set moduleList = new HashSet() // Modules to display in the Project View. -// Move all the modules from root/samples/simplepanowidget to -// root/samples-simplepanowidget. -rootProject.children.each { outerDir -> - outerDir.children.each { innerDir -> - // Rename the modules as we move them around. - innerDir.name = "$outerDir.name-$innerDir.name" - } - moduleList.addAll(outerDir.children) -} - -// Remove the top-level modules which are empty and useless. -rootProject.children.clear() - -// Add the subdirectories as top-level modules. -rootProject.children.addAll(moduleList) From bea03b2836b8c8e87bf27c9ac0ae5e8cc7614974 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 24 Jan 2019 08:44:57 +0100 Subject: [PATCH 4/4] fix manifest error/warning --- samples/sdk-controllerclient/src/main/AndroidManifest.xml | 2 +- samples/sdk-hellovr/src/main/AndroidManifest.xml | 1 - samples/sdk-video360/src/main/AndroidManifest.xml | 1 - samples/sdk-videoplayer/src/main/AndroidManifest.xml | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/samples/sdk-controllerclient/src/main/AndroidManifest.xml b/samples/sdk-controllerclient/src/main/AndroidManifest.xml index c4ddc03e..25117123 100644 --- a/samples/sdk-controllerclient/src/main/AndroidManifest.xml +++ b/samples/sdk-controllerclient/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.google.vr.sdk.samples.controllerclient" android:versionCode="181016016" android:versionName="1.190.0"> - + - diff --git a/samples/sdk-video360/src/main/AndroidManifest.xml b/samples/sdk-video360/src/main/AndroidManifest.xml index 78cdf810..6fafba31 100644 --- a/samples/sdk-video360/src/main/AndroidManifest.xml +++ b/samples/sdk-video360/src/main/AndroidManifest.xml @@ -5,7 +5,6 @@ android:versionName="1.190.0"> - diff --git a/samples/sdk-videoplayer/src/main/AndroidManifest.xml b/samples/sdk-videoplayer/src/main/AndroidManifest.xml index 713d7cad..12c271cc 100644 --- a/samples/sdk-videoplayer/src/main/AndroidManifest.xml +++ b/samples/sdk-videoplayer/src/main/AndroidManifest.xml @@ -6,7 +6,6 @@ -