Update build dependencies

angelix · angelix · commit 0d424dcd4aa8 · 2024-11-04T21:32:10.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
diff --git a/example/build.gradle b/example/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    namespace = 'com.felhr.serialportexample'
 
     defaultConfig {
         applicationId "com.felhr.serialportexample"
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.felhr.serialportexample"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host"
                   android:required="true"/>
diff --git a/example/src/main/java/com/felhr/serialportexample/UsbService.java b/example/src/main/java/com/felhr/serialportexample/UsbService.java
@@ -231,7 +231,7 @@ private void setFilter() {
      */
     private void requestUserPermission() {
         Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );
-        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
         usbManager.requestPermission(device, mPendingIntent);
     }
 
diff --git a/examplemultipleports/build.gradle b/examplemultipleports/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    namespace = 'com.felhr.examplemultipleports'
 
     defaultConfig {
         applicationId "com.felhr.examplemultipleports"
@@ -41,5 +42,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     implementation project(':usbserial')
-    implementation 'com.annimon:stream:1.2.1'
+    implementation 'com.annimon:stream:1.2.2'
 }
diff --git a/examplemultipleports/src/main/AndroidManifest.xml b/examplemultipleports/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.felhr.examplemultipleports"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host"
                   android:required="true"/>
diff --git a/examplestreams/build.gradle b/examplestreams/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    namespace = 'com.felhr.examplestreams'
 
     defaultConfig {
         applicationId "com.felhr.examplestreams"
diff --git a/examplestreams/src/main/AndroidManifest.xml b/examplestreams/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.felhr.examplestreams"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host"
                   android:required="true"/>
diff --git a/examplestreams/src/main/java/com/felhr/examplestreams/UsbService.java b/examplestreams/src/main/java/com/felhr/examplestreams/UsbService.java
@@ -211,7 +211,7 @@ private void setFilter() {
      */
     private void requestUserPermission() {
         Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );
-        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
         usbManager.requestPermission(device, mPendingIntent);
     }
 
diff --git a/examplesync/build.gradle b/examplesync/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    namespace = 'com.felhr.serialportexamplesync'
 
     defaultConfig {
         applicationId "com.felhr.serialportexamplesync"
diff --git a/examplesync/src/main/AndroidManifest.xml b/examplesync/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest package="com.felhr.serialportexamplesync"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host"
                   android:required="true"/>
diff --git a/examplesync/src/main/java/com/felhr/serialportexamplesync/UsbService.java b/examplesync/src/main/java/com/felhr/serialportexamplesync/UsbService.java
@@ -241,7 +241,7 @@ private void setFilter() {
      */
     private void requestUserPermission() {
         Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );
-        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
         usbManager.requestPermission(device, mPendingIntent);
     }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
 VERSION_NAME=6.1.0
 VERSION_CODE=1
-ANDROID_BUILD_MIN_SDK_VERSION=12
+ANDROID_BUILD_MIN_SDK_VERSION=24
 ANDROID_BUILD_TARGET_SDK_VERSION=27
 ANDROID_BUILD_SDK_VERSION=27
+org.gradle.jvmargs=-Xmx2G
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 14 15:18:57 PST 2020
+#Mon Nov 04 16:19:15 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/integrationapp/build.gradle b/integrationapp/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    namespace = 'com.felhr.integrationapp'
 
     defaultConfig {
         applicationId "com.felhr.integrationapp"
diff --git a/integrationapp/src/main/AndroidManifest.xml b/integrationapp/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.felhr.integrationapp"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host"
                   android:required="true"/>
diff --git a/integrationapp/src/main/java/com/felhr/integrationapp/UsbService.java b/integrationapp/src/main/java/com/felhr/integrationapp/UsbService.java
@@ -269,7 +269,7 @@ private void setFilter() {
      */
     private void requestUserPermission() {
         Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );
-        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
         usbManager.requestPermission(device, mPendingIntent);
     }
 
diff --git a/integrationapp/src/main/java/com/felhr/integrationapp/UsbSyncService.java b/integrationapp/src/main/java/com/felhr/integrationapp/UsbSyncService.java
@@ -209,7 +209,7 @@ private void setFilter() {
      */
     private void requestUserPermission() {
         Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );
-        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);
         usbManager.requestPermission(device, mPendingIntent);
     }
 
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,3 @@
+# configuration file for building snapshots and releases with jitpack.io
+jdk:
+  - openjdk17
diff --git a/usbserial/build.gradle b/usbserial/build.gradle
@@ -1,11 +1,10 @@
 apply plugin: 'com.android.library'
-
-def artifact = "usbserial.jar"
+apply plugin: 'maven-publish'
 
 android {
-
-    group = 'com.felhr.usbserial'
+    group = 'com.felhr'
     version = project.VERSION_NAME
+    namespace = 'com.felhr.usbserial'
 
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
 
@@ -22,30 +21,34 @@ android {
         consumerProguardFiles 'proguard-rules.pro'
     }
 
-    //noinspection GroovyAssignabilityCheck
-    task deleteJar(type: Delete) {
-        delete "eclipse_lib/${artifact}"
-    }
-
-    //noinspection GroovyAssignabilityCheck
-    task createJar(type: org.gradle.api.tasks.Copy) {
-        from('build/intermediates/bundles/release/')
-        into('eclipse_lib/')
-        include('classes.jar')
-        rename('classes.jar', artifact)
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
     }
 
     dependencies {
-        implementation 'com.annimon:stream:1.2.1'
-        implementation 'com.squareup.okio:okio:2.1.0'
+        implementation 'com.annimon:stream:1.2.2'
+        implementation 'com.squareup.okio:okio:2.3.0'
 
         androidTestImplementation 'com.android.support.test:runner:1.0.2'
         androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
         androidTestImplementation 'junit:junit:4.12'
 
         testImplementation 'junit:junit:4.12'
-
     }
+}
 
-    createJar.dependsOn(deleteJar, build)
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId = "com.felhr"
+            artifactId = "usbserial"
+            version = project.VERSION_NAME
+
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
 }
diff --git a/usbserial/eclipse_lib/usbserial.jar b/usbserial/eclipse_lib/usbserial.jar
diff --git a/usbserial/src/main/AndroidManifest.xml b/usbserial/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.felhr.usbserial"/>
+<manifest />

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.2.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:8.7.2'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ private void setFilter() {`
`231`	`231`	`*/`
`232`	`232`	`private void requestUserPermission() {`
`233`	`233`	`Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );`
`234`		`- PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);`
	`234`	`+ PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);`
`235`	`235`	`usbManager.requestPermission(device, mPendingIntent);`
`236`	`236`	`}`
`237`	`237`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private void setFilter() {`
`211`	`211`	`*/`
`212`	`212`	`private void requestUserPermission() {`
`213`	`213`	`Log.d(TAG, String.format("requestUserPermission(%X:%X)", device.getVendorId(), device.getProductId() ) );`
`214`		`- PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0);`
	`214`	`+ PendingIntent mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE);`
`215`	`215`	`usbManager.requestPermission(device, mPendingIntent);`
`216`	`216`	`}`
`217`	`217`