Updating gradle dependencies for beta2 autofill sample.
Also removed .gitignore for java sample.
Bug: 38182790
Test: manual
Change-Id: I5044b0a9aabda7437f9988244d3987b7893c1efb
diff --git a/input/autofill/AutofillFramework/Application/.gitignore b/input/autofill/AutofillFramework/Application/.gitignore
deleted file mode 100644
index 6eb878d..0000000
--- a/input/autofill/AutofillFramework/Application/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013 The Android Open Source Project
-#
-# 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.
-src/template/
-src/common/
-build.gradle
diff --git a/input/autofill/AutofillFramework/Application/build.gradle b/input/autofill/AutofillFramework/Application/build.gradle
new file mode 100644
index 0000000..1af47e6
--- /dev/null
+++ b/input/autofill/AutofillFramework/Application/build.gradle
@@ -0,0 +1,41 @@
+apply plugin: 'com.android.application'
+
+dependencies {
+ compile "com.android.support:support-v4:26.0.0-beta2"
+ compile "com.android.support:support-v13:26.0.0-beta2"
+ compile "com.android.support:cardview-v7:26.0.0-beta2"
+ compile "com.android.support:appcompat-v7:26.0.0-beta2"
+ compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
+}
+
+// The sample build uses multiple directories to
+// keep boilerplate and common code separate from
+// the main sample code.
+List<String> dirs = [
+ 'main'] // main sample code; look here for the interesting stuff.
+
+android {
+ compileSdkVersion 26
+ buildToolsVersion "26.0.0 rc2"
+
+ defaultConfig {
+ minSdkVersion 26
+ targetSdkVersion 26
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
+ }
+
+ sourceSets {
+ main {
+ dirs.each { dir ->
+ java.srcDirs "src/${dir}/java"
+ res.srcDirs "src/${dir}/res"
+ }
+ }
+ androidTest.setRoot('tests')
+ androidTest.java.srcDirs = ['tests/src']
+ }
+}
diff --git a/input/autofill/AutofillFramework/build.gradle b/input/autofill/AutofillFramework/build.gradle
index 4c2ffcb..d047fea 100644
--- a/input/autofill/AutofillFramework/build.gradle
+++ b/input/autofill/AutofillFramework/build.gradle
@@ -7,7 +7,7 @@
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
+ classpath 'com.android.tools.build:gradle:3.0.0-alpha3'
}
}
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
index c4b3fbb..8e0189d 100644
--- a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
+++ b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle
@@ -2,21 +2,27 @@
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
+dependencies {
+ compile "com.android.support:support-v4:26.0.0-beta2"
+ compile "com.android.support:support-v13:26.0.0-beta2"
+ compile 'com.android.support:appcompat-v7:26.0.0-beta2'
+ compile 'com.google.code.gson:gson:2.8.1'
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+}
+
// The sample build uses multiple directories to
// keep boilerplate and common code separate from
// the main sample code.
List<String> dirs = [
- 'main', // main sample code; look here for the interesting stuff.
- 'common', // components that are reused by multiple samples
- 'template'] // boilerplate code that is generated by the sample template process
+ 'main'] // main sample code; look here for the interesting stuff.
android {
compileSdkVersion 26
buildToolsVersion "26.0.0 rc2"
defaultConfig {
- minSdkVersion "O"
- targetSdkVersion "O"
+ minSdkVersion 26
+ targetSdkVersion 26
}
compileOptions {
@@ -36,12 +42,4 @@
}
- dependencies {
- compile "com.android.support:support-v4:26.0.0-beta1"
- compile "com.android.support:support-v13:26.0.0-beta1"
- compile 'com.android.support:appcompat-v7:26.0.0-beta1'
- compile 'com.google.code.gson:gson:2.8.0'
- compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
- }
-
}
diff --git a/input/autofill/AutofillFramework/template-params.xml b/input/autofill/AutofillFramework/template-params.xml
index e1cc325..63de875 100644
--- a/input/autofill/AutofillFramework/template-params.xml
+++ b/input/autofill/AutofillFramework/template-params.xml
@@ -22,9 +22,9 @@
<package>com.example.android.autofillframework</package>
<!-- change minSdk if needed-->
- <minSdk>"O"</minSdk>
- <compileSdkVersion>"android-O"</compileSdkVersion>
- <targetSdkVersion>"O"</targetSdkVersion>
+ <minSdk>26</minSdk>
+ <compileSdkVersion>26</compileSdkVersion>
+ <targetSdkVersion>26</targetSdkVersion>
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
