Skip to content
This repository was archived by the owner on Feb 1, 2021. It is now read-only.

Commit 9ab3659

Browse files
mirceanismirceanis
committed
Merge branch 'release/1.5.1'
2 parents eafba21 + 5a4be98 commit 9ab3659

File tree

9 files changed

+107
-18
lines changed

9 files changed

+107
-18
lines changed

‎.circleci/config.yml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
version: 2
2+
jobs:
3+
node-dependencies:
4+
working_directory: ~/repo
5+
docker:
6+
- image: circleci/node:8
7+
steps:
8+
- checkout
9+
- restore_cache:
10+
keys:
11+
- yarn-{{ arch }}-v1-{{ checksum "yarn.lock" }}
12+
- yarn-{{ arch }}-v1
13+
- run:
14+
name: install-dependencies
15+
command: yarn
16+
- save_cache:
17+
key: yarn-{{ arch }}-v1-{{ checksum "yarn.lock" }}
18+
paths:
19+
- ~/.cache/yarn
20+
- persist_to_workspace:
21+
root: ~/repo
22+
paths:
23+
- node_modules
24+
25+
android-dependencies:
26+
working_directory: ~/repo/android
27+
docker:
28+
- image: circleci/android:api-28-node8-alpha
29+
environment:
30+
ANDROID_HOME: /opt/android/sdk
31+
TERM: dumb
32+
LC_ALL: en_US.UTF-8
33+
LANG: en_US.UTF-8
34+
steps:
35+
- checkout:
36+
path: ~/repo
37+
- attach_workspace:
38+
at: ~/repo
39+
- restore_cache:
40+
keys:
41+
- android-{{ arch }}-v1-{{ checksum "build.gradle" }}
42+
- android-{{ arch }}-v1
43+
- run:
44+
name: get android dependencies
45+
command: ./gradlew dependencies androidDependencies
46+
- save_cache:
47+
key: android-{{ arch }}-v1-{{ checksum "build.gradle" }}
48+
paths:
49+
- .gradle
50+
- ~/.gradle
51+
52+
android-test:
53+
working_directory: ~/repo/android
54+
docker:
55+
- image: circleci/android:api-28-node8-alpha
56+
environment:
57+
ANDROID_HOME: /opt/android/sdk
58+
TERM: dumb
59+
LC_ALL: en_US.UTF-8
60+
LANG: en_US.UTF-8
61+
steps:
62+
- checkout:
63+
path: ~/repo
64+
- attach_workspace:
65+
at: ~/repo
66+
- restore_cache:
67+
keys:
68+
- android-{{ arch }}-v1-{{ checksum "build.gradle" }}
69+
- android-{{ arch }}-v1
70+
- run:
71+
name: run a simple test to check it compiles
72+
command: ./gradlew test
73+
74+
workflows:
75+
version: 2
76+
run-ci-checks:
77+
jobs:
78+
- node-dependencies
79+
- android-dependencies:
80+
requires:
81+
- node-dependencies
82+
- android-test:
83+
requires:
84+
- android-dependencies

‎README.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
[![npm](https://img.shields.io/npm/dt/react-native-uport-signer.svg)](https://www.npmjs.com/package/react-native-uport-signer)
33
[![npm](https://img.shields.io/npm/v/react-native-uport-signer.svg)](https://www.npmjs.com/package/react-native-uport-signer)
4+
[![CircleCI](https://circleci.com/gh/uport-project/react-native-uport-signer.svg?style=svg)](https://circleci.com/gh/uport-project/react-native-uport-signer)
45

56
# react-native-uport-signer
67

@@ -66,7 +67,7 @@ project(':react-native-uport-signer').projectDir = new File(rootProject.projectD
6667
```
6768

6869
4. Open up `android/app/src/main/java/[...]/MainActivity.java`
69-
- Add `import com.reactlibrary.RNUportSignerPackage;` to the imports at the top of the file
70+
- Add `import me.uport.rnsigner.RNUportSignerPackage;` to the imports at the top of the file
7071
- Add `new RNUportSignerPackage()` to the list returned by the `getPackages()` method
7172

7273

@@ -254,7 +255,16 @@ RNUportSigner.signTx(address,
254255

255256
```
256257

258+
## Contributions welcome
259+
260+
Please run `yarn install` after checkout to get an up-to-speed dev environment for this library.
261+
257262
## Changelog
263+
264+
* 1.5.1
265+
- [Android] bugfix - changed package name to `me.uport.rnsigner` thanks to @VMadalin ( #34 )
266+
- support - add simple CI checks (#35)
267+
258268
* 1.5.0
259269
- [iOS] fix parameter name for deleteSeed
260270
- Adds typescript support

‎android/src/main/AndroidManifest.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.reactlibrary">
4-
5-
</manifest>
6-
1+
<manifest package="me.uport.rnsigner" />

‎android/src/main/java/com/reactlibrary/RNUportHDSignerModule.kt renamed to ‎android/src/main/java/me/uport/rnsigner/RNUportHDSignerModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("unused", "KDocUnresolvedReference", "TooManyFunctions")
22

3-
package com.reactlibrary
3+
package me.uport.rnsigner
44

55
import android.text.TextUtils
66
import com.facebook.react.bridge.Promise

‎android/src/main/java/com/reactlibrary/RNUportSignerModule.kt renamed to ‎android/src/main/java/me/uport/rnsigner/RNUportSignerModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("unused", "TooManyFunctions")
22

3-
package com.reactlibrary
3+
package me.uport.rnsigner
44

55
import android.content.Context
66
import android.content.Intent

‎android/src/main/java/com/reactlibrary/RNUportSignerPackage.kt renamed to ‎android/src/main/java/me/uport/rnsigner/RNUportSignerPackage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("unused")
22

3-
package com.reactlibrary
3+
package me.uport.rnsigner
44

55
import com.facebook.react.ReactPackage
66
import com.facebook.react.bridge.JavaScriptModule

‎android/src/test/java/com/reactlibrary/ModuleTest.kt renamed to ‎android/src/test/java/me/uport/rnsigner/ModuleTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reactlibrary
1+
package me.uport.rnsigner
22

33
import org.junit.Test
44
import java.util.*

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-uport-signer",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"description": "",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",

‎yarn.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -2530,9 +2530,9 @@ lodash.throttle@^4.1.1:
25302530
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
25312531

25322532
lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1:
2533-
version "4.17.11"
2534-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
2535-
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
2533+
version "4.17.15"
2534+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
2535+
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
25362536

25372537
loose-envify@^1.0.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
25382538
version "1.4.0"
@@ -2983,9 +2983,9 @@ minizlib@^1.1.1:
29832983
minipass "^2.2.1"
29842984

29852985
mixin-deep@^1.2.0:
2986-
version "1.3.1"
2987-
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
2988-
integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
2986+
version "1.3.2"
2987+
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
2988+
integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
29892989
dependencies:
29902990
for-in "^1.0.2"
29912991
is-extendable "^1.0.1"

0 commit comments

Comments
 (0)