diff --git a/app/build.gradle b/app/build.gradle index 9c6e3ab..b1384b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 33 defaultConfig { applicationId "jp.shts.android.storyprogressbar" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -17,14 +16,22 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } + + packagingOptions { + exclude 'META-INF/com.android.tools/proguard/coroutines.pro' + } } dependencies { implementation project(':library') - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9505e53..010af4e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/build.gradle b/build.gradle index 68e19b3..0e6476a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,11 @@ buildscript { repositories { - jcenter() - mavenCentral() google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.android.tools.build:gradle:3.5.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -16,8 +14,8 @@ buildscript { allprojects { repositories { - jcenter() google() + mavenCentral() } } diff --git a/library/build.gradle b/library/build.gradle index 5c2dd28..fce5b55 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 33 buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -22,9 +22,8 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + implementation 'androidx.appcompat:appcompat:1.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' })