Skip to content
This repository has been archived by the owner on Nov 8, 2019. It is now read-only.

Android Studio 3.3 #602

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions samples/ndk-hellovr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions samples/ndk-hellovrbeta/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions samples/sdk-controllerclient/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/sdk-controllerclient/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="com.google.vr.sdk.samples.controllerclient"
android:versionCode="181016016"
android:versionName="1.190.0">
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />

<uses-feature android:glEsVersion="0x00030002" android:required="true" />

<application
Expand Down
4 changes: 2 additions & 2 deletions samples/sdk-hellovr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 0 additions & 1 deletion samples/sdk-hellovr/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
android:versionName="1.190.0">

<!-- The GVR SDK requires API 19+ and OpenGL ES 2+. -->
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />

<!-- Required for vibration feedback when the trigger action is performed. -->
Expand Down
4 changes: 2 additions & 2 deletions samples/sdk-video360/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 0 additions & 1 deletion samples/sdk-video360/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
android:versionName="1.190.0">

<!-- The VR app is Daydream-only since it uses the controller. -->
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24"/>
<uses-feature android:glEsVersion="0x00030002" android:required="true" />

<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
Expand Down
4 changes: 2 additions & 2 deletions samples/sdk-videoplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 0 additions & 1 deletion samples/sdk-videoplayer/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<!-- The video API works on Daydream-ready devices with Asynchronous
Reprojection on Android N+ and OpenGL ES 3+ -->
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />
<uses-feature android:glEsVersion="0x00030002" android:required="true" />

<!-- Required by the app to stream video. -->
Expand Down
18 changes: 0 additions & 18 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)