Skip to content

Commit

Permalink
Update gradle 7.0 and Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
Canato committed Sep 1, 2021
1 parent 14c2d9b commit c0e1b86
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions cropper/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'kotlin-parcelize'

group='com.github.Canato'
Expand All @@ -15,8 +14,8 @@ android {
versionName rootProject.libVersion
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
lintOptions {
abortOnError false
Expand All @@ -25,7 +24,7 @@ android {
viewBinding true
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_11.toString()
}
testOptions {
unitTests {
Expand All @@ -35,7 +34,7 @@ android {
}

dependencies {
api "androidx.appcompat:appcompat:$androidXAppCompatVersionCropper"
api "androidx.appcompat:appcompat:$androidXAppCompatVersion"

implementation "androidx.activity:activity-ktx:$androidXActivity"

Expand Down
4 changes: 0 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ org.gradle.parallel=true
# necessary projects.
org.gradle.configureondemand=true

# When set to true, this will force Gradle to not run a task if its inputs and outputs are
# equivalent to what they were during its previous execution.
android.enableBuildCache=true

# When set to true, Gradle will reuse task outputs from any previous build, when possible.
org.gradle.caching=true

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ android {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
freeCompilerArgs = ["-Xinline-classes"]
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_11.toString()
}
buildFeatures {
viewBinding true
Expand All @@ -29,7 +29,7 @@ android {

dependencies {
api project(':cropper')
api "androidx.appcompat:appcompat:$androidXAppCompatVersionSample"
api "androidx.appcompat:appcompat:$androidXAppCompatVersion"
implementation "androidx.core:core-ktx:$androidXCoreKtxVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
implementation "com.google.android.material:material:$materialVersion"
Expand Down
19 changes: 9 additions & 10 deletions versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,26 @@ ext {
minSdkVersion = 14

// Gradle's
androidGradleVersion = '4.1.2'
androidGradleVersion = '7.0.0'
ktlintGradleVersion = '10.0.0'
mavenGradleVersion = '2.1'

// JetBrains
kotlinVersion = '1.4.30'
coroutinesVersion = '1.4.2'
kotlinVersion = '1.5.21'
coroutinesVersion = '1.5.1'

// Android
materialVersion = '1.4.0-alpha01'

// AndroidX
androidXActivity = '1.2.3'
androidXAppCompatVersionSample = '1.3.0-rc01'
androidXAppCompatVersionCropper = '1.2.0' // Used to avoid not release stable versions on the lib
androidXExifVersion = '1.3.2'
androidXCoreKtxVersion = '1.3.2'
androidXActivity = '1.3.1'
androidXAppCompatVersion = '1.3.1'
androidXExifVersion = '1.3.3'
androidXCoreKtxVersion = '1.6.0'
androidXLifeCycleVersion = '2.3.1'
androidXJunitVersion = '1.0.0'
androidXJunitVersion = '1.1.3'
androidXFragmentVersion = '1.3.5'
androidXTestVersion = '1.3.0'
androidXTestVersion = '1.4.0'

// JUnit
junitVersion = '4.13.2'
Expand Down

0 comments on commit c0e1b86

Please sign in to comment.