Merge branch 'release/1.6.5'

Florianisme · Jan 27, 2023 · d543734 · d543734
2 parents 8ac95cc + 443e1b9
commit d543734
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 77 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,25 +16,23 @@ pipeline {
             steps {
                 archiveArtifacts artifacts: 'app/build/outputs/bundle/release/app-release.aab', followSymlinks: false, onlyIfSuccessful: true
                 archiveArtifacts artifacts: 'app/build/outputs/apk/release/app-release.apk', followSymlinks: false, onlyIfSuccessful: true
-                archiveArtifacts artifacts: 'app/build/outputs/mapping/release/mapping.txt', followSymlinks: false, onlyIfSuccessful: true
                 archiveArtifacts artifacts: 'wear/build/outputs/bundle/release/wear-release.aab', followSymlinks: false, onlyIfSuccessful: true
                 archiveArtifacts artifacts: 'wear/build/outputs/apk/release/wear-release.apk', followSymlinks: false, onlyIfSuccessful: true
-                archiveArtifacts artifacts: 'wear/build/outputs/mapping/release/mapping.txt', followSymlinks: false, onlyIfSuccessful: true
             }
         }
 	    stage('Publish to Play Store') {
 		    steps {
 			    script {
                     if (env.BRANCH_NAME == 'master') {
                         echo 'Publishing Bundle to Beta channel (Not allowed to fail)'
-                        androidApkUpload deobfuscationFilesPattern: 'app/build/outputs/mapping/release/mapping.txt,wear/build/outputs/mapping/release/mapping.txt', filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '20', trackName: 'beta'
+                        androidApkUpload filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '20', trackName: 'beta'
                     } else if (env.BRANCH_NAME == 'release') {
                         echo 'Publishing Bundle to Internal channel (Not allowed to fail)'
-                        androidApkUpload deobfuscationFilesPattern: 'app/build/outputs/mapping/release/mapping.txt,wear/build/outputs/mapping/release/mapping.txt', filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '100', trackName: 'internal'
+                        androidApkUpload filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '100', trackName: 'internal'
                     } else if (env.BRANCH_NAME == 'develop' || env.BRANCH_NAME.contains('feature')) {
                         echo 'Publishing Bundle to Internal channel (Allowed to fail)'
                         try {
-                            androidApkUpload deobfuscationFilesPattern: 'app/build/outputs/mapping/release/mapping.txt,wear/build/outputs/mapping/release/mapping.txt', filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '100', trackName: 'internal'
+                            androidApkUpload filesPattern: 'app/build/outputs/bundle/release/app-release.aab,wear/build/outputs/bundle/release/wear-release.aab', googleCredentialsId: 'Florianisme', rolloutPercentage: '100', trackName: 'internal'
                         } catch(error) {
                             currentBuild.result = 'SUCCESS'
                         }

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply from: "$rootProject.projectDir/shared-build.gradle"
 
 android {
     defaultConfig {
-        versionCode 45
+        versionCode 55
         wearAppUnbundled true
     }
     buildFeatures {
@@ -12,14 +12,14 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment:2.5.3'
     implementation 'androidx.navigation:navigation-ui:2.5.3'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    def room_version = "2.4.3"
+    def room_version = "2.5.0"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/main/java/de/florianisme/wakeonlan/persistence/entities/Device.java b/app/src/main/java/de/florianisme/wakeonlan/persistence/entities/Device.java
@@ -5,28 +5,47 @@
 import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 @Entity(tableName = "Devices")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Device {
 
     @PrimaryKey(autoGenerate = true)
+    @JsonProperty("id")
+    @JsonAlias("a")
     public int id;
 
     @ColumnInfo(name = "name")
+    @JsonProperty("name")
+    @JsonAlias("b")
     public String name;
 
     @ColumnInfo(name = "mac_address")
+    @JsonProperty("mac_address")
+    @JsonAlias("c")
     public String macAddress;
 
     @ColumnInfo(name = "broadcast_address")
+    @JsonProperty("broadcast_address")
+    @JsonAlias("d")
     public String broadcastAddress;
 
     @ColumnInfo(name = "port")
+    @JsonProperty("port")
+    @JsonAlias("e")
     public int port;
 
     @ColumnInfo(name = "status_ip")
+    @JsonProperty("status_ip")
+    @JsonAlias("f")
     public String statusIp;
 
     @ColumnInfo(name = "secure_on_password")
+    @JsonProperty("secure_on_password")
+    @JsonAlias("g")
     public String secureOnPassword;
 
     @Ignore

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Dec 23 12:21:22 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/shared-build.gradle b/shared-build.gradle
@@ -1,6 +1,6 @@
 android {
     namespace 'de.florianisme.wakeonlan'
-    compileSdk 32
+    compileSdk 33
 
     signingConfigs {
         release {
@@ -17,18 +17,15 @@ android {
     defaultConfig {
         applicationId "de.florianisme.wakeonlan"
         minSdk 24
-        targetSdk 32
-        versionName "1.6.1"
+        targetSdk 33
+        versionName "1.6.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -3,7 +3,7 @@ apply from: "$rootProject.projectDir/shared-build.gradle"
 
 android {
     defaultConfig {
-        versionCode 44
+        versionCode 54
     }
 }
 

diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro