diff --git a/build.gradle b/build.gradle
index 6cf3dba0..a4d79c44 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
@@ -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/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
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-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/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-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/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"
}
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 @@
-
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)