Modernize

.github/workflows/Android-CI.yml

@@ -5,19 +5,19 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: 17
+      - uses: gradle/wrapper-validation-action@v1
       - name: Build with Gradle
         run: ./gradlew assemble testDebugUnitTest

.github/workflows/release.yml

@@ -15,9 +15,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'adopt'
+          java-version: 17
       - name: Build project
         run: ./gradlew build
         env:

build.gradle

@@ -1,16 +1,16 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

example/build.gradle

@@ -1,23 +1,24 @@
-apply plugin: 'com.android.application'
-
-dependencies {
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation project(':openpgp-api')
+plugins {
+    id 'com.android.application'
 }
 
 android {
-    compileSdkVersion 28
-
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        compileSdk 34
+        targetSdkVersion 34
         applicationId 'org.openintents.openpgp.example'
         versionCode 6
         versionName '7.0'
     }
-
-    // Do not abort build if lint finds errors
-    lintOptions {
+    lint {
         abortOnError false
     }
+    namespace 'org.openintents.openpgp.example'
+
+}
+
+dependencies {
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation project(':openpgp-api')
 }

example/src/main/AndroidManifest.xml

@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openintents.openpgp.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="OpenPGP API Example">
         <activity
             android:name=".BaseActivity"
-            android:label="OpenPGP API Example">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".OpenPgpApiActivity"
+            android:exported="true"
             android:label="OpenPGP API"
             android:windowSoftInputMode="stateHidden" />
     </application>
 
-</manifest>
+</manifest>

gradle.properties

@@ -1,2 +1,4 @@
 android.enableJetifier=true
-android.useAndroidX=true
+android.useAndroidX=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists