Merge branch 'develop' into 'master'

Develop

See merge request papers/airgap/beacon-android-sdk!72

Author: jsamol

.github/ISSUE_TEMPLATE/BUG.md

@@ -0,0 +1,47 @@
+---
+name: Bug Report
+about: Create a report to help us improve the SDK.
+labels: bug
+---
+
+<!-- 
+This template will help you write a detailed bug report that includes the information we would ask you for anyway. 
+Please, use it to fill out the issue, if you don't, the issue will be closed immediately.
+-->
+
+### Bug Report
+
+- [ ] I'm using the latest version of the SDK. <!-- If not, you should update and check if the issue persists before continuing here. -->
+- [ ] I've seen [the docs](https://docs.walletbeacon.io) and [the demo code](https://github.com/airgap-it/beacon-android-sdk/tree/master/demo). <!-- Not a must, but consider checking them if you haven't already. -->
+- [ ] I'm using the SDK directly (not via a 3rd party library or application).
+    <!-- You may ignore the following checks, if you ticked the above. -->
+    - [ ] I've been able to confirm that the issue comes from this SDK, not the 3rd party software on top. <!-- If not, you should consider contacting the other developer first. -->
+
+#### Current Behavior
+
+<!-- Explain in a clear and concise way what happens now. -->
+
+#### Expected Behavior
+
+<!-- Explain in a clear and concise way what you expected to happen instead. -->
+
+#### How to Reproduce?
+
+<!-- 
+Please, describe what steps should be taken in order to reproduce the issue.
+
+If it's possible, consider providing a minimal reproducible example (MRE)
+(with instructions on how to run it and how to reproduce the issue there).
+
+When adding code directly into this issue, make sure it's only a small and clear snippet.
+If the code is more complex, see the MRE part :)
+-->
+
+#### Environment
+
+- Device: **PLACEHOLDER** <!-- e.g. Samsung Galaxy S20 or a simulator -->
+- OS version: **PLACEHOLDER** <!-- e.g. Android 12 (API 32) -->
+
+#### Additional Context
+
+<!-- You can put here any additional data that you think may be helpful to explain your problem, e.g. logs or screenshots. -->

.github/ISSUE_TEMPLATE/FEATURE.md

@@ -0,0 +1,30 @@
+---
+name: Feature Request
+about: Suggest an idea for this project.
+labels: enhancement
+---
+
+<!-- 
+This template will help you write a detailed feature request that includes the information we would ask you for anyway. 
+Please, use it to fill out the issue, if you don't, the issue will be closed immediately.
+-->
+
+### Feature Request
+
+- [ ] I'm using the latest version of the SDK. <!-- If not, consider updating and checking if the SDK still lacks the feature. Just in case :) -->
+
+#### Summary
+
+<!-- Write a short description of the new feature. -->
+
+#### Expected Behaviour
+
+<!-- Explain in a clear and concise way how you expect this feature to behave. -->
+
+#### Use Case
+
+<!-- Explain in a clear and concise way what is the use case of the feature. -->
+
+#### Additional Context
+
+<!-- You can put here any additional data that you think may be helpful to explain the feature you request for. -->

build.gradle

@@ -5,10 +5,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Version.kotlin}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:${Version.kotlin}"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

buildSrc/src/main/java/GradleConfig.kt

@@ -1,14 +1,14 @@
 object Android {
-    const val compileSdk = 32
+    const val compileSdk = 33
     const val minSdk = 21
-    const val targetSdk = 32
+    const val targetSdk = 33
 
-    const val versionCode = 27
-    const val versionName = "3.2.2"
+    const val versionCode = 31
+    const val versionName = "3.2.3"
 }
 
 object Version {
-    const val kotlin = "1.5.30"
+    const val kotlin = "1.7.20"
 
     const val kotlinSerialization = "1.3.1"
 

core/src/main/java/it/airgap/beaconsdk/core/internal/migration/v3_2_0/SerializersFromV3_2_0.kt

@@ -46,7 +46,7 @@ private data class PeerSurrogate(
     val isPaired: Boolean = false,
 ) {
     fun toTarget(): Peer = when (type) {
-        Type.P2P -> P2pPeer(id, name, publicKey, relayServer, version, icon, appUrl)
+        Type.P2P -> P2pPeer(id, name, publicKey, relayServer, version, icon, appUrl, isPaired)
     }
 
     @Serializable