Merge pull request #415 from WalletConnect/develop

RC.5

Author: Talhaali00

.github/actions/ci_relay/action.yml

@@ -0,0 +1,19 @@
+name: 'Relay Integration Tests'
+description: 'Runs Kotlin SDK integration tests with Relay server'
+
+runs:
+  using: "composite"
+  steps:
+    # Necessary to macos-latest to update to Java 11, and to enable caching gradle files for quicker execution
+    - name: Setup Java JDK
+      uses: actions/[email protected]
+      with:
+        distribution: 'zulu'
+        java-version: '11'
+        architecture: x86_64
+        cache: 'gradle'
+
+    - name: Relay integration tests
+# TODO: Add SDK_VERSION env var
+      shell: bash
+      run: ./gradlew :foundation:test --tests "com.walletconnect.foundation.RelayTest" -i

.github/workflows/ci_relay.yml

@@ -1,43 +1,33 @@
-#name: Relay Integration
-#
-#
-## IMPORTANT. GHA only for demo purposes.
-#on:
-#  push:
-#    branches:
-#      - feature/sign/instrumented_tests
-#  pull_request:
-#    branches:
-#      - feature/sign/instrumented_tests
-#
-#concurrency:
-#  # Support push/pr as event types with different behaviors each:
-#  # 1. push: queue up builds by branch
-#  # 2. pr: only allow one run per PR
-#  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref_name }}
-#  # If there is already a workflow running for the same pull request, cancel it
-#  # For non-PR triggers queue up builds
-#  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-#
-#jobs:
-#  validate:
-#    runs-on: macos-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#      - name: Setup Java JDK
-#        uses: actions/[email protected]
-#        with:
-#          distribution: 'zulu'
-#          java-version: '11'
-#          architecture: x86_64
-#      - name: Instrumentation tests
-#        env:
-#          TEST_RELAY_URL: wss://relay.walletconnect.com
-#          TEST_PROJECT_ID: 2ee94aca5d98e6c05c38bce02bee952a
-#        uses: reactivecircus/android-emulator-runner@v2
-#        with:
-#          api-level: 32
-#          arch: x86_64
-#          target: google_apis
-#          script: ./gradlew :sign:connectedCheck
+name: Relay Integration Tests
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - develop
+      - master
+
+concurrency:
+  # Support push/pr as event types with different behaviors each:
+  # 1. push: queue up builds by branch
+  # 2. pr: only allow one run per PR
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref_name }}
+  # If there is already a workflow running for the same pull request, cancel it
+  # For non-PR triggers queue up builds
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  integration_tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Run Relay CI
+        env:
+          TEST_RELAY_URL: wss://relay.walletconnect.com
+          TEST_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
+        uses: ./.github/actions/ci_relay

.github/workflows/android.yml renamed to .github/workflows/ci_sdks.yml

@@ -1,4 +1,4 @@
-name: Android Test and deploy
+name: SDKs Unit Tests
 
 on:
   push:
@@ -24,17 +24,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Unit tests
+
+      - name: Cache Gradle
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Sign Unit tests
+        env:
+          WC_CLOUD_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
+        run: ./gradlew :sign:sdk:testDebugUnitTest
+
+      - name: Auth Unit tests
         env:
           WC_CLOUD_PROJECT_ID: ${{ secrets.WC_CLOUD_PROJECT_ID }}
-        run: ./gradlew test
-#  android_tests:
-#    runs-on: macos-latest
-#    steps:
-#      - uses: actions/checkout@v2
-#
-#      - name: Instrumentation Tests
-#        uses: reactivecircus/android-emulator-runner@v2
-#        with:
-#          api-level: 29
-#          script: ./gradlew walletconnectv2:connectedAndroidTest
+        run: ./gradlew :auth:sdk:testDebugUnitTest
+
+      - name: Stop Gradle
+        run: ./gradlew --stop

ReadMe.md

@@ -5,10 +5,11 @@
 The communications protocol for web3, WalletConnect brings the ecosystem together by enabling hundreds of wallets and apps to securely connect and interact. This repository contains Kotlin implementation of
 WalletConnect v2 protocols for Android applications.
 
-## Protocols
+## SDks
 
-* [Sign SDK](https://github.com/WalletConnect/WalletConnectKotlinV2/tree/develop/signSDK)
-* [Chat SDK](https://github.com/WalletConnect/WalletConnectKotlinV2/tree/develop/chatSDK)
+* [Core SDK](https://github.com/WalletConnect/WalletConnectKotlinV2/tree/develop/androidCore)
+* [Sign SDK](https://github.com/WalletConnect/WalletConnectKotlinV2/tree/develop/sign)
+* [Auth SDK](https://github.com/WalletConnect/WalletConnectKotlinV2/tree/develop/auth)
 
 ## License
 WalletConnect v2 is released under the Apache 2.0 license. [See LICENSE](https://github.com/WalletConnect/WalletConnectKotlinV2/blob/feature/develop/LICENSE) for details.

androidCore/ReadMe.md

@@ -0,0 +1,38 @@
+# **WalletConnect Core - Android**
+
+Kotlin implementation of WalletConnect Core SDK for Android applications.
+
+![Maven Central](https://img.shields.io/maven-central/v/com.walletconnect/android-core)
+
+## Requirements
+
+* Android min SDK 23
+* Java 11
+
+## Documentation and usage
+
+* [Installation guide](https://docs.walletconnect.com/2.0/kotlin/guides/relay) 
+
+ 
+
+## Installation
+
+root/build.gradle.kts:
+
+```gradle
+allprojects {
+ repositories {
+    mavenCentral()
+ }
+}
+```
+
+app/build.gradle.kts
+
+```gradle
+implementation("com.walletconnect:android-core:release_version")
+```
+
+## Project ID
+
+For the Project ID look at [Project ID](https://walletconnect.com/).

androidCore/common/build.gradle.kts

@@ -0,0 +1,70 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    id("com.google.devtools.ksp") version kspVersion
+    id("com.squareup.sqldelight")
+    id("publish-module-android")
+}
+
+project.apply {
+    extra[KEY_PUBLISH_ARTIFACT_ID] = "android-core-common"
+    extra[KEY_PUBLISH_VERSION] = "1.0.0"
+    extra[KEY_SDK_NAME] = "Android Core Common"
+}
+
+android {
+    compileSdk = COMPILE_SDK
+
+    defaultConfig {
+        minSdk = MIN_SDK
+        targetSdk = TARGET_SDK
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = jvmVersion
+        targetCompatibility = jvmVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = jvmVersion.toString()
+        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.time.ExperimentalTime"
+    }
+}
+
+sqldelight {
+    database("Database") {
+        packageName = "com.walletconnect.android.impl"
+    }
+}
+
+dependencies {
+    debugApi(project(":foundation"))
+    releaseApi("com.walletconnect:foundation:1.0.0")
+
+    bouncyCastle()
+    coroutines()
+    moshiKsp()
+    moshi()
+    scarlet()
+    scarletAndroid()
+    sqlDelightAndroid()
+    sqlCipher()
+    security()
+    koinAndroid()
+    multibaseJava()
+    timber()
+
+    jUnit5()
+    jUnit5Android()
+    mockk()
+}

signSDK/samples_common/consumer-rules.pro renamed to androidCore/common/consumer-rules.pro

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.walletconnect.android.common">
+
+</manifest>

signSDK/dapp/proguard-rules.pro renamed to androidCore/common/proguard-rules.pro

@@ -1,27 +1,27 @@
-package com.walletconnect.sign.core.model.vo.jsonRpc
+package com.walletconnect.android.common
 
 import com.squareup.moshi.JsonClass
 
-internal sealed class JsonRpcResponseVO {
+sealed class JsonRpcResponse : SerializableJsonRpc {
     abstract val id: Long
 
-    @JsonClass(generateAdapter = true)
-    internal data class JsonRpcResult(
+    @JsonClass(generateAdapter = false)
+    data class JsonRpcResult(
         override val id: Long,
         val jsonrpc: String = "2.0",
         val result: Any,
-    ) : JsonRpcResponseVO()
+    ) : JsonRpcResponse()
 
     @JsonClass(generateAdapter = true)
-    internal data class JsonRpcError(
+    data class JsonRpcError(
         override val id: Long,
         val jsonrpc: String = "2.0",
         val error: Error,
-    ) : JsonRpcResponseVO() {
+    ) : JsonRpcResponse() {
         val errorMessage: String = "${error.message} : code: ${error.code}"
     }
 
-    internal data class Error(
+    data class Error(
         val code: Int,
         val message: String,
     )