Skip to content

Commit

Permalink
chore: bump kotlin to 1.9.22, gradle to 8.2 (#1313)
Browse files Browse the repository at this point in the history
Co-authored-by: dkhawk <[email protected]>
  • Loading branch information
dkhawk and dkhawk authored Mar 6, 2024
1 parent 2786543 commit d069ebf
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ library/gen
project.properties
.DS_Store
.java-version
secrets.properties
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.9.22'
repositories {
google()
mavenCentral()
Expand All @@ -24,7 +24,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.2.2'
classpath 'com.mxalbert.gradle:jacoco-android:0.2.1'
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand Down
9 changes: 5 additions & 4 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ dependencies {
// [START_EXCLUDE silent]
implementation project(':library')

implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'

// [END_EXCLUDE]
}
Expand All @@ -66,8 +66,9 @@ dependencies {

secrets {
// To add your Maps API key to this project:
// 1. Open the file local.properties found under the root project
// 1. Create a file ./secrets.properties
// 2. Add this line, where YOUR_API_KEY is your API key:
// MAPS_API_KEY=YOUR_API_KEY
defaultPropertiesFileName 'local.defaults.properties'
propertiesFileName 'secrets.properties'
}
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-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions lint-checks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ lintOptions {
}

dependencies {
compileOnly "com.android.tools.lint:lint-api:31.1.4"
compileOnly "com.android.tools.lint:lint-checks:31.1.4"
compileOnly "com.android.tools.lint:lint-api:31.3.0"
compileOnly "com.android.tools.lint:lint-checks:31.3.0"
// compileOnly "com.android.tools.lint:manifest-merger:31.1.0"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testImplementation "junit:junit:4.13.2"
testImplementation "com.android.tools.lint:lint:31.1.4"
testImplementation "com.android.tools.lint:lint-tests:31.1.4"
testImplementation "com.android.tools:testutils:31.1.2"
testImplementation "com.android.tools.lint:lint:31.3.0"
testImplementation "com.android.tools.lint:lint-tests:31.3.0"
testImplementation "com.android.tools:testutils:31.3.0"
}

jar {
Expand All @@ -28,6 +28,6 @@ jar {
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

0 comments on commit d069ebf

Please sign in to comment.