diff --git a/app/build.gradle b/app/build.gradle index a349712..ec5faef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,25 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} android { - signingConfigs { - config { - Properties properties = new Properties() - File propertiesFile = project.rootProject.file('app/gradle.properties') - if (propertiesFile.exists()) { - properties.load(propertiesFile.newDataInputStream()) - storeFile file(properties.getProperty('KEYSTORE_FILE')) - keyAlias properties.getProperty('KEY_ALIAS') - storePassword properties.getProperty('KEYSTORE_PASSWORD') - keyPassword properties.getProperty('KEY_PASSWORD') - } - } - } - buildToolsVersion '29.0.2' - compileSdkVersion 29 + compileSdk 33 defaultConfig { applicationId "com.jaiselrahman.filepickersample" - minSdkVersion 14 - targetSdkVersion 29 + minSdk 23 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -28,20 +17,23 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.config } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'com.github.bumptech.glide:glide:4.14.2' + implementation project(path: ':filepicker') testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.2-alpha01' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01' - implementation project(':filepicker') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0926f89..0dff2a4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,16 @@ + + - + + + + + - + diff --git a/build.gradle b/build.gradle index a64add5..03c4a7b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:7.2.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/filepicker/build.gradle b/filepicker/build.gradle index 530715f..d3a4a8d 100644 --- a/filepicker/build.gradle +++ b/filepicker/build.gradle @@ -1,11 +1,12 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' +} android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdk 33 defaultConfig { - minSdkVersion 14 - targetSdkVersion 29 + minSdk 23 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -22,15 +23,15 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.google.android.material:material:1.1.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.recyclerview:recyclerview:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.paging:paging-runtime:2.1.2' + implementation 'androidx.paging:paging-runtime:3.2.0' - implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation 'com.github.bumptech.glide:glide:4.14.2' - implementation "androidx.activity:activity:1.2.0-alpha04" + implementation "androidx.activity:activity:1.4.0" testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.2-alpha01' diff --git a/gradle.properties b/gradle.properties index 8de5058..7f69adb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,6 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8eade00..87f79a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Jun 10 13:16:39 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip