Update build

skjolber · skjolber · commit 3c4461130a7f · 2025-11-25T23:39:23.000+01:00
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.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
diff --git a/.github/workflows/master.yml b/.github/workflows/master.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
diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,4 @@ Desktop.ini
 *~
 .merge_file*
 /.gradle/
+build
diff --git a/.travis.yml b/.travis.yml
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,16 +15,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace "com.skjolberg.mifare.desfiretool"
+
     lintOptions {
         abortOnError false
     }
 
-
-    compileOptions {
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 dependencies {
@@ -35,3 +31,4 @@ dependencies {
     testImplementation project(":test")
     androidTestImplementation project(":test")
 }
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -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>
diff --git a/app/src/main/java/com/skjolberg/mifare/desfiretool/MainActivity.java b/app/src/main/java/com/skjolberg/mifare/desfiretool/MainActivity.java
@@ -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() {
diff --git a/build.gradle b/build.gradle
@@ -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,12 @@ 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()
-    }
+    repositories repos
 }
 
 task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Oct 12 21:07:57 CEST 2022
+#Wed Nov 15 13:53:38 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/libfreefare/build.gradle b/libfreefare/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
     }
 
     testOptions {
@@ -23,16 +21,12 @@ android {
         }
     }
 
+    namespace "libfreefare.desfire.skjolber.github.com"
+
     lintOptions {
         abortOnError false
     }
 
-
-    compileOptions {
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 dependencies {
diff --git a/libfreefare/src/main/AndroidManifest.xml b/libfreefare/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="libfreefare.desfire.skjolber.github.com">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.NFC" />
 
diff --git a/model/build.gradle b/model/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
     }
 
     buildTypes {
@@ -16,15 +14,11 @@ android {
         }
     }
 
+    namespace "model.ev1.desfire.skjolber.github.com"
+
     lintOptions {
         abortOnError false
     }
-
-    compileOptions {
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 dependencies {
diff --git a/model/src/main/AndroidManifest.xml b/model/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="model.ev1.desfire.skjolber.github.com">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
   
 </manifest>
diff --git a/nfcjlib/build.gradle b/nfcjlib/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
     }
 
     buildTypes {
@@ -17,6 +15,8 @@ android {
         }
     }
 
+    namespace "nfcjlib.desfire.skjolber.github.com"
+
     lintOptions {
         abortOnError false
     }
diff --git a/nfcjlib/src/main/AndroidManifest.xml b/nfcjlib/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="nfcjlib.desfire.skjolber.github.com"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,5 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
 include ':test', ':model', ':app', ':libfreefare', ':nfcjlib'
 
diff --git a/test/build.gradle b/test/build.gradle
@@ -7,11 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -24,11 +21,7 @@ android {
         abortOnError false
     }
 
-    compileOptions {
-        // Sets Java compatibility to Java 8
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    namespace "no.entur.abt.client.sdk.test"
 }
 dependencies {
     api "junit:junit:${junitVersion}"
diff --git a/test/src/androidTest/AndroidManifest.xml b/test/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="no.entur.abt.client.sdk.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
diff --git a/test/src/main/AndroidManifest.xml b/test/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="no.entur.abt.client.sdk.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,12 @@ android {`
`15`	`15`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`16`	`16`	`}`
`17`	`17`	`}`
	`18`	`+ namespace "com.skjolberg.mifare.desfiretool"`
	`19`	`+`
`18`	`20`	`lintOptions {`
`19`	`21`	`abortOnError false`
`20`	`22`	`}`
`21`	`23`
`22`		`-`
`23`		`- compileOptions {`
`24`		`- // Sets Java compatibility to Java 8`
`25`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`26`		`- targetCompatibility JavaVersion.VERSION_1_8`
`27`		`- }`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`dependencies {`
`@@ -35,3 +31,4 @@ dependencies {`
`35`	`31`	`testImplementation project(":test")`
`36`	`32`	`androidTestImplementation project(":test")`
`37`	`33`	`}`
	`34`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`
`7`	`7`	`repositories repos`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.4.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.13.1'`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`@@ -18,15 +18,12 @@ ext {`
`18`	`18`	`androidxTestUiAutomatorVersion = '2.2.0'`
`19`	`19`	`androidxTestExtJunitVersion = '1.1.4'`
`20`	`20`	`mockitoVersion = '4.9.0'`
`21`		`- byteBuddyVersion = '1.14.5'`
	`21`	`+ byteBuddyVersion = '1.18.1'`
`22`	`22`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`allprojects {`
`26`		`- repositories {`
`27`		`- google()`
`28`		`- jcenter()`
`29`		`- }`
	`26`	`+ repositories repos`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`task clean(type: Delete) {`