diff --git a/app/build.gradle b/app/build.gradle index 8f6de73..dc6ddd0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,16 +26,17 @@ android { dataBinding true } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } + namespace 'com.shz.imagepicker.imagepickerapp' } dependencies { implementation project(':imagepicker') implementation 'com.github.bumptech.glide:glide:4.13.2' kapt 'com.github.bumptech.glide:compiler:4.13.2' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.9.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0d57f76..4f6e9e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 2bc9701..77cdbfc 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.0.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10' - //classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0" } } diff --git a/gradle.properties b/gradle.properties index 01b80d7..b08c9fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6eeef91..fd7c09e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Dec 13 18:15:08 EET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle index b3ccca7..bbabfce 100644 --- a/imagepicker/build.gradle +++ b/imagepicker/build.gradle @@ -6,12 +6,11 @@ plugins { def libraryGroupId = 'com.shz.imagepicker' def libraryArtifactId = 'imagepicker' -def libraryVersion = '2.0.1' +def libraryVersion = '2.0.3' android { compileSdkVersion 33 - defaultConfig { minSdkVersion 16 targetSdkVersion 33 @@ -19,32 +18,39 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } - + publishing { + singleVariant("release") { + withSourcesJar() + withJavadocJar() + } + } buildTypes { release { minifyEnabled false } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } + namespace 'com.shz.imagepicker.imagepicker' } dependencies { - implementation "androidx.appcompat:appcompat:1.5.1" - implementation "androidx.recyclerview:recyclerview:1.2.1" - implementation "androidx.exifinterface:exifinterface:1.3.5" + implementation "androidx.appcompat:appcompat:1.6.1" + implementation "androidx.recyclerview:recyclerview:1.3.1" + implementation "androidx.exifinterface:exifinterface:1.3.6" } -publishing { - publications { - aar(MavenPublication) { - groupId libraryGroupId - version libraryVersion - artifactId libraryArtifactId - - artifact("$buildDir/outputs/aar/${artifactId}-release.aar") +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + groupId libraryGroupId + version libraryVersion + artifactId libraryArtifactId + } } } -} +} \ No newline at end of file diff --git a/imagepicker/src/main/AndroidManifest.xml b/imagepicker/src/main/AndroidManifest.xml index ec478a6..a3a6bf8 100644 --- a/imagepicker/src/main/AndroidManifest.xml +++ b/imagepicker/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/jitpack.yml b/jitpack.yml index adb3fe1..efde7bf 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk11 + - openjdk17