Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 0bc3697

Browse files
committed
Revert "Use desugaring to support java.time on lower api levels"
This reverts commit 59cbe05
1 parent 59cbe05 commit 0bc3697

4 files changed

Lines changed: 9 additions & 30 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:3.1.2'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1111
}
1212
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 29 10:27:21 CET 2021
1+
#Mon Jun 04 09:21:46 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

library/build.gradle

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,21 @@ android {
66
buildToolsVersion "27.0.3"
77

88
defaultConfig {
9-
minSdkVersion 21
9+
minSdkVersion 26
1010
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
1313
}
14-
1514
buildTypes {
1615
release {
1716
minifyEnabled false
1817
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1918
}
2019
}
21-
22-
compileOptions {
23-
// Flag to enable support for the new language APIs
24-
coreLibraryDesugaringEnabled true
25-
// Sets Java compatibility to Java 8
26-
sourceCompatibility JavaVersion.VERSION_1_8
27-
targetCompatibility JavaVersion.VERSION_1_8
28-
}
2920
}
3021

3122
dependencies {
32-
// desugar java.time
33-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
23+
// add dependencies here
3424
}
3525

3626
// build a jar with source files

sampleapp/build.gradle

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66

77
defaultConfig {
88
applicationId "scrollingimageview.android.q42.com.sampleapp"
9-
minSdkVersion 21
9+
minSdkVersion 26
1010
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
@@ -17,21 +17,10 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20-
21-
compileOptions {
22-
// Flag to enable support for the new language APIs
23-
coreLibraryDesugaringEnabled true
24-
// Sets Java compatibility to Java 8
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
27-
}
2820
}
2921

3022
dependencies {
31-
implementation fileTree(dir: 'libs', include: ['*.jar'])
32-
implementation 'com.android.support:appcompat-v7:27.1.1'
33-
implementation project(':library')
34-
35-
// desugar java.time in library
36-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
23+
compile fileTree(dir: 'libs', include: ['*.jar'])
24+
compile 'com.android.support:appcompat-v7:27.1.1'
25+
compile project(':library')
3726
}

0 commit comments

Comments
 (0)