Migrate to up to date gradle

AmrDeveloper · AmrDeveloper · commit c41aa00127cd · 2024-12-25T14:13:21.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,12 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.amrdeveloper.treeviewlib"
+        namespace "com.amrdeveloper.treeviewlib"
         minSdk 16
-        targetSdk 31
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -22,8 +23,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
@@ -33,7 +34,7 @@ dependencies {
 
     implementation project(path: ':treeview')
 
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="#99000000">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M7,10l5,5 5,-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -3,9 +3,9 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal"
+    android:tint="#99000000"
     android:autoMirrored="true">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M10,17l5,-5 -5,-5v10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
@@ -3,9 +3,9 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal"
+    android:tint="#99000000"
     android:autoMirrored="true">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="#99000000">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_green_circle.xml b/app/src/main/res/drawable/ic_green_circle.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#3BEE13"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
+    <path android:fillColor="#ffffff" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_red_circle.xml b/app/src/main/res/drawable/ic_red_circle.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#D00D0D"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
+    <path android:fillColor="#ffffff" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
 </vector>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.TreeView" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.TreeView" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/black</item>
         <item name="colorPrimaryVariant">@color/black</item>
diff --git a/build.gradle b/build.gradle
@@ -1,16 +1,11 @@
 buildscript {
-
-    ext {
-        mavenPublishVersion = '0.18.0'
-    }
-
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath "com.vanniktech:gradle-maven-publish-plugin:$mavenPublishVersion"
+        classpath 'com.android.tools.build:gradle:8.7.0'
+        classpath "com.vanniktech:gradle-maven-publish-plugin:0.30.0"
     }
 }
 
@@ -21,12 +16,4 @@ allprojects {
     }
 }
 
-apply plugin: "com.vanniktech.maven.publish"
-
-allprojects {
-    plugins.withId("com.vanniktech.maven.publish") {
-        mavenPublish {
-            sonatypeHost = "S01"
-        }
-    }
-}
+apply plugin: "com.vanniktech.maven.publish"
diff --git a/gradle.properties b/gradle.properties
@@ -10,6 +10,9 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 systemProp.org.gradle.internal.http.connectionTimeout=120000
 systemProp.org.gradle.internal.http.socketTimeout=120000
 
+# when publishing to https://s01.oss.sonatype.org
+SONATYPE_HOST=S01
+
 GROUP=io.github.amrdeveloper
 VERSION_NAME=1.2.0
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
-#Sun Feb 13 12:51:31 EET 2022
+#Wed Dec 25 13:43:22 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/treeview/src/main/AndroidManifest.xml b/treeview/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.amrdeveloper.treeview"/>
+<manifest/>

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`android {`
`6`		`- compileSdk 31`
	`6`	`+ compileSdk 34`
`7`	`7`
`8`	`8`	`defaultConfig {`
`9`	`9`	`applicationId "com.amrdeveloper.treeviewlib"`
	`10`	`+ namespace "com.amrdeveloper.treeviewlib"`
`10`	`11`	`minSdk 16`
`11`		`- targetSdk 31`
	`12`	`+ targetSdk 34`
`12`	`13`	`versionCode 1`
`13`	`14`	`versionName "1.0"`
`14`	`15`
`@@ -22,8 +23,8 @@ android {`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`compileOptions {`
`25`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`26`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`26`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`27`	`+ targetCompatibility JavaVersion.VERSION_17`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`@@ -33,7 +34,7 @@ dependencies {`
`33`	`34`
`34`	`35`	`implementation project(path: ':treeview')`
`35`	`36`
`36`		`- implementation 'com.google.code.gson:gson:2.9.0'`
	`37`	`+ implementation 'com.google.code.gson:gson:2.10.1'`
`37`	`38`
`38`	`39`	`testImplementation 'junit:junit:4.13.2'`
`39`	`40`	`androidTestImplementation 'androidx.test.ext:junit:1.1.3'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<manifest package="com.amrdeveloper.treeview"/>`
	`2`	`+<manifest/>`