Prepare for Android 14 (#30)

* Prepare for Android 14 * Small changes at changelog --------- Co-authored-by: Arkadiusz Wochniak <[email protected]>
ringpublishing · Sep 6, 2023 · bd85edc · bd85edc
1 parent a456ef9
commit bd85edc
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 19 deletions.
diff --git a/Changelogs/1.7.3 b/Changelogs/1.7.3
@@ -0,0 +1,7 @@
+1.7.3 Release notes (2023-09-06)
+=============================================================
+
+### Changes
+
+* Gradle 8
+* Android 14
diff --git a/RingPublishingGDPR/build.gradle b/RingPublishingGDPR/build.gradle
@@ -3,13 +3,13 @@ apply from: file('publish.gradle')
 
 android
 {
-    compileSdkVersion APP_COMPILE_SDK_VERSION
-    buildToolsVersion APP_BUILD_TOOLS_VERSION
+    namespace 'com.ringpublishing.gdpr'
+    compileSdk APP_COMPILE_SDK_VERSION
 
     compileOptions
     {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig
@@ -48,6 +48,11 @@ android
         }
     }
 
+    buildFeatures
+    {
+        buildConfig = true
+    }
+
     lintOptions {}
 
     testBuildType 'debug'

diff --git a/RingPublishingGDPR/publish.gradle b/RingPublishingGDPR/publish.gradle
@@ -6,7 +6,7 @@ def LIB_VERSION = "$sdk_version_name"
 
 task sourceJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 publishing {

diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,7 @@ buildscript
 
     dependencies
     {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath "com.novoda:gradle-android-command-plugin:1.5.0"
+        classpath "com.android.tools.build:gradle:8.1.0"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.43.0"
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.24.18"
     }
@@ -39,7 +38,7 @@ task clean(type: Delete) {
 
 project.ext {
     APP_MIN_SDK_VERSION = 24
-    APP_COMPILE_SDK_VERSION = 33
-    APP_TARGET_SDK_VERSION = 33
-    APP_BUILD_TOOLS_VERSION = '33.0.0'
+    APP_COMPILE_SDK_VERSION = 34
+    APP_TARGET_SDK_VERSION = 34
+    APP_BUILD_TOOLS_VERSION = '34.0.0'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply from: '../bamboo.gradle'
 android
 {
-    compileSdkVersion APP_COMPILE_SDK_VERSION
-    buildToolsVersion APP_BUILD_TOOLS_VERSION
+    namespace 'com.ringpublishing.gdpr.demo'
+    compileSdk APP_COMPILE_SDK_VERSION
 
     compileOptions
     {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     buildFeatures
@@ -26,7 +26,6 @@ android
 
     defaultConfig
     {
-        applicationId "com.ringpublishing.gdpr.demo"
         minSdkVersion APP_MIN_SDK_VERSION
         targetSdkVersion APP_TARGET_SDK_VERSION
 
@@ -89,6 +88,8 @@ dependencies
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
 
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
     debugImplementation 'com.squareup.curtains:curtains:1.2.2'//todo fix crash from leakcanary 2.7 remove if leakcanary will get new version 2.8
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #Fri, 20 Nov 2020 08:47:09 +0100
-org.gradle.jvmargs=-Xmx3072m -XX\:MaxPermSize\=1024m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+org.gradle.jvmargs=-Xmx3072m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
 #org.gradle.parallel=true
 org.gradle.daemon=true
 #org.gradle.configureondemand=true
@@ -11,5 +11,6 @@ android.enableJetifier=true
 # This valuse should be incremented automatically using release task fastlane publish_open_source_sdk
 # Remember create changelog file before publish_open_source_sdk
 # TO change this manually use gradle method bumpPatchVersion bumpMinorVersion bumpMajorVersion
-sdk_version_name=1.7.2
-sdk_version_code=22
+
+sdk_version_name=1.7.3
+sdk_version_code=23
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists