Update dependencies, sdk and java version

eltos · Nov 4, 2023 · eca263b · eca263b
1 parent 1e0d532
commit eca263b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 35 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle b/build.gradle
@@ -6,10 +6,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.2'
 
         // Required plugins added to classpath to facilitate pushing to maven
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -10,11 +10,13 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=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
@@ -1,6 +1,6 @@
-#Wed Dec 11 12:30:21 CET 2019
+#Sat Nov 04 11:57:33 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
diff --git a/lintchecks/build.gradle b/lintchecks/build.gradle
@@ -3,13 +3,8 @@ apply plugin: 'com.android.lint'
 
 dependencies {
     // If the Gradle plugin version is X.Y.Z, then the Lint library version is X+23.Y.Z
-    compileOnly 'com.android.tools.lint:lint-api:30.3.0'
-    compileOnly 'com.android.tools.lint:lint-checks:30.3.0'
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    compileOnly 'com.android.tools.lint:lint-api:31.1.2'
+    compileOnly 'com.android.tools.lint:lint-checks:31.1.2'
 }
 
 jar {

diff --git a/simpledialogfragments/build.gradle b/simpledialogfragments/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 33
+    namespace 'eltos.simpledialogfragment'
+
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 33
-        versionCode rootProject.ext['VERSION_NR']
-        versionName rootProject.ext['VERSION']
+        targetSdkVersion 34
     }
     buildTypes {
         release {
@@ -20,6 +20,12 @@ android {
         checkDependencies true
         disable 'MissingTranslation'
     }
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
@@ -29,7 +35,7 @@ dependencies {
 
     testImplementation  'junit:junit:4.13.2'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.alimuzaffar.lib:pinentryedittext:2.0.6'
 }

diff --git a/simpledialogfragments/src/main/AndroidManifest.xml b/simpledialogfragments/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eltos.simpledialogfragment">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 

diff --git a/testApp/build.gradle b/testApp/build.gradle
@@ -4,12 +4,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    namespace 'eltos.simpledialogfragments'
+
+    compileSdk 34
 
     defaultConfig {
         applicationId 'eltos.simpledialogfragments.test'
         minSdkVersion 14
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode rootProject.ext['VERSION_NR']
         versionName rootProject.ext['VERSION']
     }
@@ -19,13 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 repositories {
@@ -36,9 +31,9 @@ repositories {
 dependencies {
     testImplementation  'junit:junit:4.13.2'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation 'com.google.zxing:core:3.5.0'
+    implementation 'com.google.zxing:core:3.5.2'
 
     // sonatype maven
     //implementation 'io.github.eltos:simpledialogfragments:3.5.1'

diff --git a/testApp/src/main/AndroidManifest.xml b/testApp/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eltos.simpledialogfragments">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />