diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2019-06-26 17:17:08 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2019-06-26 17:17:08 -0700 |
| commit | 588801999e8e8ea9ec080a796f72fefa17f3cd3b (patch) | |
| tree | 400a5d9e2cef24acdc71310c219ea7ffaaf8ddab | |
| parent | e42958e2566677063eb6c8923a64c55a5f7a5575 (diff) | |
| download | support-588801999e8e8ea9ec080a796f72fefa17f3cd3b.tar.gz | |
Move the rest of core libraries back to Java 7
androidx.activity
androidx.customview
androidx.fragment
androidx.lifecycle:*live-data-core & *-viewmodel
androidx.loader
androidx.viewpager
Test: ./gradlew bOS
Bug: 135942802
Change-Id: I8056fd3ca5c49f07285e4507fcf62e2a3547bdd3
| -rw-r--r-- | activity/activity/build.gradle | 7 | ||||
| -rw-r--r-- | customview/build.gradle | 7 | ||||
| -rw-r--r-- | fragment/fragment/build.gradle | 7 | ||||
| -rw-r--r-- | lifecycle/lifecycle-livedata-core/build.gradle | 7 | ||||
| -rw-r--r-- | lifecycle/lifecycle-viewmodel/build.gradle | 4 | ||||
| -rw-r--r-- | loader/loader/build.gradle | 7 | ||||
| -rw-r--r-- | viewpager/build.gradle | 7 |
7 files changed, 46 insertions, 0 deletions
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle index 0efa3160340..95e55746644 100644 --- a/activity/activity/build.gradle +++ b/activity/activity/build.gradle @@ -9,6 +9,13 @@ plugins { id("kotlin-android") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { api("androidx.annotation:annotation:1.1.0") api("androidx.core:core:1.1.0-rc01") { diff --git a/customview/build.gradle b/customview/build.gradle index 763aa5995f4..1525c293728 100644 --- a/customview/build.gradle +++ b/customview/build.gradle @@ -8,6 +8,13 @@ plugins { id("com.android.library") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { api("androidx.annotation:annotation:1.1.0") api("androidx.core:core:1.1.0-rc01") diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle index f41f66ff4f3..aee191f0362 100644 --- a/fragment/fragment/build.gradle +++ b/fragment/fragment/build.gradle @@ -9,6 +9,13 @@ plugins { id("kotlin-android") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { api("androidx.annotation:annotation:1.1.0") api("androidx.core:core:1.1.0-rc01") { diff --git a/lifecycle/lifecycle-livedata-core/build.gradle b/lifecycle/lifecycle-livedata-core/build.gradle index d91042c059c..e6f31a5a744 100644 --- a/lifecycle/lifecycle-livedata-core/build.gradle +++ b/lifecycle/lifecycle-livedata-core/build.gradle @@ -25,6 +25,13 @@ plugins { id("com.android.library") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { implementation(project(":arch:core-common")) implementation(project(":arch:core-runtime")) diff --git a/lifecycle/lifecycle-viewmodel/build.gradle b/lifecycle/lifecycle-viewmodel/build.gradle index 5d350490bd5..e501d7f7868 100644 --- a/lifecycle/lifecycle-viewmodel/build.gradle +++ b/lifecycle/lifecycle-viewmodel/build.gradle @@ -26,6 +26,10 @@ plugins { } android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } buildTypes.all { consumerProguardFiles 'proguard-rules.pro' } diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle index ec9f490cecc..a83f99326da 100644 --- a/loader/loader/build.gradle +++ b/loader/loader/build.gradle @@ -8,6 +8,13 @@ plugins { id("com.android.library") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { api("androidx.annotation:annotation:1.0.0") api("androidx.core:core:1.0.0") diff --git a/viewpager/build.gradle b/viewpager/build.gradle index 34d439fe8fa..096137bacd3 100644 --- a/viewpager/build.gradle +++ b/viewpager/build.gradle @@ -8,6 +8,13 @@ plugins { id("com.android.library") } +android { + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + } +} + dependencies { api("androidx.annotation:annotation:1.1.0") api("androidx.core:core:1.1.0-rc01") |