Skip to content

Commit

Permalink
update gradle kotlin and agp
Browse files Browse the repository at this point in the history
  • Loading branch information
Sinan Kozak committed Feb 8, 2022
1 parent e8d0b50 commit d321301
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions android-lints/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'maven-publish'
group = 'com.kozaxinan.android-lints'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 14
Expand All @@ -17,7 +17,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildToolsVersion '31.0.0'
buildToolsVersion '32.0.0'
}

afterEvaluate {
Expand Down
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {

ext.kotlin_version = "1.5.31"
ext.kotlin_version = "1.6.10"

repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:7.0.3"
classpath "com.android.tools.build:gradle:7.1.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.gradleup:auto-manifest-plugin:1.0.4'
Expand All @@ -21,7 +20,6 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
}
}

Expand All @@ -37,6 +35,6 @@ task clean(type: Delete) {
}

wrapper {
gradleVersion = '7.2'
gradleVersion = '7.4'
distributionType = Wrapper.DistributionType.BIN
}
9 changes: 4 additions & 5 deletions checks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compileOnly "com.android.tools.lint:lint-api:30.0.3"
compileOnly "com.android.tools.lint:lint-checks:30.0.3"
compileOnly "com.android.tools.lint:lint-api:30.1.1"
compileOnly "com.android.tools.lint:lint-checks:30.1.1"

testImplementation "com.android.tools.lint:lint:30.0.3"
testImplementation "com.android.tools.lint:lint-tests:30.0.3"
testImplementation "com.android.tools.lint:lint:30.1.1"
testImplementation "com.android.tools.lint:lint-tests:30.1.1"
testImplementation "junit:junit:4.13.2"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
// testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
}

jar {
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ org.gradle.parallel=true
# Automatically convert third-party libraries to use AndroidX
#android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.code.style=official

org.gradle.unsafe.configuration-cache-problems=warn
org.gradle.unsafe.configuration-cache=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit d321301

Please sign in to comment.