add cardboard to gradle dependencies

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -1529,9 +1529,11 @@ protected void createGradleProject(File projectFolder, File exportFolder)
     } else {
       createTopModule(projectFolder, exportFolder, "':app'");
       if (appComponent == CARDBOARD) {
-        createAppModule(projectFolder, exportFolder, CARDBOARD_GRADLE_BUILD_TEMPLATE, "24.0.1");
+        createAppModule(projectFolder, exportFolder, min_sdk_cardboard, 
+            CARDBOARD_GRADLE_BUILD_TEMPLATE, "24.0.1");
       } else {
-        createAppModule(projectFolder, exportFolder, APP_GRADLE_BUILD_TEMPLATE, "24.0.1");
+        createAppModule(projectFolder, exportFolder, min_sdk_fragment, 
+            APP_GRADLE_BUILD_TEMPLATE, "24.0.1");
       }
     }
   }
@@ -1560,15 +1562,15 @@ private void createTopModule(File projectFolder, File exportFolder,
   }
 
   private void createAppModule(File projectFolder, File exportFolder, 
-      String tmplFile, String buildToolsVer) throws SketchException, IOException {
+      String min_sdk, String tmplFile, String buildToolsVer) throws SketchException, IOException {
     File moduleFolder = mkdirs(exportFolder, "app");
 
     File appBuildTemplate = mode.getContentFile("templates/" + tmplFile);    
     File appBuildFile = new File(moduleFolder, "build.gradle");    
     HashMap<String, String> replaceMap = new HashMap<String, String>();    
     replaceMap.put("@@build_tools@@", buildToolsVer);
     replaceMap.put("@@package_name@@", getPackageName());    
-    replaceMap.put("@@min_sdk@@", AndroidBuild.min_sdk_fragment);  
+    replaceMap.put("@@min_sdk@@", min_sdk);  
     replaceMap.put("@@target_sdk@@", AndroidBuild.target_sdk);    
     replaceMap.put("@@wear_version@@", wear_version);
     replaceMap.put("@@gvr_version@@", gvr_sdk_version);
@@ -1582,7 +1584,10 @@ private void createAppModule(File projectFolder, File exportFolder,
     File coreFile = new File(projectFolder, "libs/processing-core.jar");    
     File libsFolder = mkdirs(moduleFolder, "libs");
     Util.copyFile(coreFile, new File(libsFolder, "processing-core.jar"));
-        
+
+    File cardboardFile = new File(projectFolder, "libs/cardboard.jar");
+    Util.copyFile(cardboardFile, new File(libsFolder, "cardboard.jar"));    
+    
     File mainFolder = mkdirs(moduleFolder, "src/main");
     File javaFolder = mkdirs(mainFolder, "java");
     File resFolder = mkdirs(mainFolder, "res");

templates/CardboardBuild.gradle.tmpl

@@ -1,44 +1,33 @@
-/*
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-apply plugin: 'com.android.model.application'
+apply plugin: 'com.android.application'
 
-model {
-    android {
-        compileSdkVersion @@target_sdk@@
-        buildToolsVersion "@@build_tools@@"
-
-        defaultConfig {
-            applicationId "@@package_name@@"
-            minSdkVersion.apiLevel @@min_sdk@@
-            targetSdkVersion.apiLevel @@target_sdk@@
-            versionCode @@version_code@@
-            versionName "@@version_name@@"
-        }
-
-        buildTypes {
-            release {
-                minifyEnabled true
-                proguardFiles.add(file('../../proguard-gvr.txt'))
-            }
+android {
+    compileSdkVersion @@target_sdk@@
+    buildToolsVersion "@@build_tools@@"
+    defaultConfig {
+        applicationId "@@package_name@@"
+        minSdkVersion @@min_sdk@@
+        targetSdkVersion @@target_sdk@@
+        versionCode @@version_code@@
+        versionName "@@version_name@@"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:design:23.4.0'    
     compile 'com.google.vr:sdk-audio:@@gvr_version@@'
     compile 'com.google.vr:sdk-base:@@gvr_version@@'
+    testCompile 'junit:junit:4.12'
     compile files('libs/processing-core.jar')
+    compile files('libs/cardboard.jar')
 }