Update build (#8)

* Update build

* Simplify a bit

Author: skjolber

.github/workflows/android.yml

@@ -0,0 +1,24 @@
+name: Build libraries + example client
+on:
+  push:
+    branches-ignore:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build with Gradle
+        run: ./gradlew build --info --stacktrace

.github/workflows/feature.yml

@@ -0,0 +1,24 @@
+name: Master
+on:
+  push:
+    branches:
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build with Gradle
+        run: ./gradlew build --info --stacktrace

.github/workflows/master.yml

@@ -119,3 +119,4 @@ Desktop.ini
 *~
 .merge_file*
 /.gradle/
+build

.gitignore

@@ -1,30 +1,11 @@
-apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
     defaultConfig {
         applicationId "com.skjolberg.mifare.desfiretool"
-        minSdkVersion 19
-        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        abortOnError false
-    }
-
-
-    compileOptions {
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    namespace "com.skjolberg.mifare.desfiretool"
 }
 
 dependencies {
@@ -35,3 +16,4 @@ dependencies {
     testImplementation project(":test")
     androidTestImplementation project(":test")
 }
+

.travis.yml

@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.skjolberg.mifare.desfiretool"
->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -28,4 +26,4 @@
 
     </application>
 
-</manifest>
+</manifest>

app/build.gradle

@@ -707,26 +707,23 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-    	
-    	case R.id.action_settings: {
-    		showKeysFragment();
-    		return true;
-    	}
 
-    	case R.id.action_add: {
-    		addKey();
-    		return true;
-    	}
+		if(item.getItemId() == R.id.action_settings) {
+			showKeysFragment();
+			return true;
+		}
 
-    	case R.id.action_save : {
-    		saveFileData();
-    		return true;
-    	}
-    	
-    	default:
-    		return super.onOptionsItemSelected(item);
-    	}
+		if(item.getItemId() == R.id.action_add) {
+			addKey();
+			return true;
+		}
+
+		if(item.getItemId() == R.id.action_save) {
+			saveFileData();
+			return true;
+		}
+
+		return super.onOptionsItemSelected(item);
 	}
 
 	private void addKey() {

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@ buildscript {
 
     repositories repos
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.13.1'
     }
 }
 
@@ -18,15 +18,68 @@ ext {
     androidxTestUiAutomatorVersion = '2.2.0'
     androidxTestExtJunitVersion = '1.1.4'
     mockitoVersion = '4.9.0'
-    byteBuddyVersion = '1.14.5'
+    byteBuddyVersion = '1.18.1'
 
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
+def buildProjects() {
+    subprojects.findAll { new File(it.projectDir, 'build.gradle').file }
+}
+
+def androidApplicationProjects() {
+    subprojects.findAll { it.name.endsWith("app")}
+}
+
+def androidLibraryProjects() {
+    buildProjects().findAll {  !androidApplicationProjects().contains(it)}
+}
+
+configure(androidLibraryProjects()) {
+    apply plugin: 'com.android.library'
+}
+
+configure(androidApplicationProjects()) {
+    apply plugin: 'com.android.application'
+}
+
+
+configure(buildProjects()) {
+    repositories repos
+
+    android {
+
+        compileSdkVersion 33
+
+        defaultConfig {
+            minSdkVersion 19
+            targetSdkVersion 33
+        }
+
+        testOptions {
+            unitTests {
+                returnDefaultValues = true
+            }
+        }
+
+        buildTypes {
+            release {
+                minifyEnabled false
+                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            }
+        }
+
+
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_11
+            targetCompatibility JavaVersion.VERSION_11
+        }
+
+        lintOptions {
+            abortOnError false
+        }
     }
+
+
 }
 
 task clean(type: Delete) {