Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
• Gradle 8.0
• Android Gradle Plugin 8.1.0
• Material Design 1.9.0 (Sample app)
• Java 17 (Compile & Kotlin options)
  • Loading branch information
akexorcist committed Jul 26, 2023
1 parent 6103fd8 commit cc9b09b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace 'com.akexorcist.roundcornerprogressbar.example'
compileSdkVersion project.compileSdkVersion
compileSdk project.compileSdkVersion

defaultConfig {
applicationId "com.akexorcist.roundcornerprogressbar"
Expand All @@ -24,12 +24,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

buildFeatures {
Expand All @@ -39,7 +39,7 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
implementation project(':round-corner-progress-bar')
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ buildscript {
}

plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'com.android.application' version '8.1.0' apply false
id 'com.android.library' version '8.1.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id 'org.jetbrains.dokka-android' version '0.9.18' apply false
}
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ android.useAndroidX=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
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
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-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
11 changes: 10 additions & 1 deletion round-corner-progress-bar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ plugins {

android {
namespace 'com.akexorcist.roundcornerprogressbar'
compileSdkVersion project.compileSdkVersion
compileSdk project.compileSdkVersion

defaultConfig {
minSdkVersion project.minSdkVersion
Expand All @@ -47,6 +47,15 @@ android {
res.srcDirs = ['src/main/res']
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}
}

task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
Expand Down

0 comments on commit cc9b09b

Please sign in to comment.