Skip to content

Commit

Permalink
Upgraded to nativeTemplate 7.0.15 and Credo-ts v0.5.9
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Flores <jorge@entidad.io>
  • Loading branch information
jorgefl0 committed Aug 15, 2024
1 parent 616d8fb commit 90a185a
Show file tree
Hide file tree
Showing 41 changed files with 31,252 additions and 9,510 deletions.
37 changes: 17 additions & 20 deletions source/prj/.dependencies
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
{
"react-native-camera": "3.40.0",
"json-query": "^2.2.2",
"react-native-sensitive-info": "^6.0.0-alpha.9",
"react-native-argon2": "^2.0.1",
"react-native-crypto": "^2.2.0",
"@credo-ts/anoncreds": "^0.5.3",
"@credo-ts/askar": "^0.5.3",
"@credo-ts/core": "^0.5.3",
"@credo-ts/indy-vdr": "^0.5.3",
"@credo-ts/openid4vc": "^0.5.3",
"@credo-ts/react-native": "^0.5.3",
"@entidad/questionnaire": "git+http://github.com/entidad/credo-ts-survey.git",
"@hyperledger/anoncreds-react-native": "^0.2.2",
"@hyperledger/aries-askar-react-native": "^0.2.1",
"@hyperledger/indy-vdr-react-native": "^0.2.2",
"@animo-id/react-native-ble-didcomm": "0.8.0",
"@credo-ts/anoncreds": "0.5.9",
"@credo-ts/askar": "0.5.9",
"@credo-ts/core": "0.5.9",
"@credo-ts/indy-vdr": "0.5.9",
"@credo-ts/openid4vc": "0.5.9",
"@credo-ts/question-answer": "0.5.9",
"@credo-ts/react-native": "0.5.9",
"@credo-ts/transport-ble": "0.3.0",
"@hyperledger/anoncreds-react-native": "0.2.2",
"@hyperledger/aries-askar-react-native": "0.2.3",
"@hyperledger/indy-vdr-react-native": "0.2.2",
"base-64": "^1.0.0",
"credo-ts-didweb-anoncreds": "^0.0.1-alpha.12",
"credo-ts-media-sharing": "^0.0.1-alpha.9",
"react-native-fs": "^2.20.0",
"react-native-get-random-values": "^1.11.0",
"text-encoding": "^0.7.0"
}
"credo-ts-didweb-anoncreds": "git+http://github.com/Entidad/credo-ts-didweb-anoncreds.git",
"react-native-fs": "2.20.0",
"react-native-get-random-values": "1.11.0",
"text-encoding": "0.7.0"
}
504 changes: 252 additions & 252 deletions source/prj/.mx/releases_list.json

Large diffs are not rendered by default.

37 changes: 17 additions & 20 deletions source/prj/.native_dependencies
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"react-native-camera": "3.40.0",
"json-query": "^2.2.2",
"react-native-sensitive-info": "^6.0.0-alpha.9",
"react-native-argon2": "^2.0.1",
"react-native-crypto": "^2.2.0",
"react-native-localize": "1.4.2",
"@credo-ts/anoncreds": "^0.5.3",
"@credo-ts/askar": "^0.5.3",
"@credo-ts/core": "^0.5.3",
"@credo-ts/indy-vdr": "^0.5.3",
"@credo-ts/openid4vc": "^0.5.3",
"@credo-ts/react-native": "^0.5.3",
"@entidad/questionnaire": "git+http://github.com/entidad/credo-ts-survey.git",
"@hyperledger/anoncreds-react-native": "^0.2.2",
"@hyperledger/aries-askar-react-native": "^0.2.1",
"@hyperledger/indy-vdr-react-native": "^0.2.2",
"@animo-id/react-native-ble-didcomm": "0.8.0",
"@credo-ts/anoncreds": "0.5.9",
"@credo-ts/askar": "0.5.9",
"@credo-ts/core": "0.5.9",
"@credo-ts/indy-vdr": "0.5.9",
"@credo-ts/openid4vc": "0.5.9",
"@credo-ts/question-answer": "0.5.9",
"@credo-ts/react-native": "0.5.9",
"@credo-ts/transport-ble": "0.3.0",
"@hyperledger/anoncreds-react-native": "0.2.2",
"@hyperledger/aries-askar-react-native": "0.2.3",
"@hyperledger/indy-vdr-react-native": "0.2.2",
"base-64": "^1.0.0",
"credo-ts-didweb-anoncreds": "^0.0.1-alpha.12",
"credo-ts-media-sharing": "^0.0.1-alpha.9",
"react-native-fs": "^2.20.0",
"react-native-get-random-values": "^1.11.0",
"text-encoding": "^0.7.0"
}
"credo-ts-didweb-anoncreds": "git+http://github.com/Entidad/credo-ts-didweb-anoncreds.git",
"react-native-fs": "2.20.0",
"react-native-get-random-values": "1.11.0",
"text-encoding": "0.7.0"
}
2 changes: 1 addition & 1 deletion source/prj/.template_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v7.0.10
v7.0.15
21 changes: 21 additions & 0 deletions source/prj/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

- We've fixed an issue with cookies encryption. If you still run into a problem, please logout & login or clear the app cache.

# [7.0.13] - 2024-06-05

- We enhanced encrypted file sync on Android.

# [7.0.12] - 2024-05-27

- We've added the support of scheduling local notifications on Android 14

# [7.0.11] - 2024-05-13

- We've made the switch to Xcode 15.1 for cloud builds (Appcenter), in response to the updated minimum iOS sdk requirements.
- We have added a basic privacy manifest to iOS.

# [7.0.10] - 2024-03-15

- We updated the Android manifest file to support opening URLs with links to websites whose apps are installed on the device.

## [7.0.9] - 2023-10-13

### Fixed

- We fixed build errors caused by the recent XCode 15 update.
Expand Down
19 changes: 3 additions & 16 deletions source/prj/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ android {
}
namespace "com.mendix.nativetemplate"
defaultConfig {
applicationId "app.ufwfoundation.fwos"
applicationId "io.entidad.app.fwos"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
missingDimensionStrategy "react-native-camera", "general"
versionCode 7
versionName '0.0.7'
versionCode 9
versionName "0.1.0"
testBuildType System.getProperty("testBuildType", "debug")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resValue "string", "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())
Expand Down Expand Up @@ -92,15 +92,6 @@ android {
release {
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"

ndk {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
debug {
ndk {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
}
// applicationVariants are e.g. debug, release
Expand Down Expand Up @@ -131,10 +122,6 @@ dependencies {

implementation "com.facebook.react:react-native:+" // From node_modules

//Required by Credo (Formerly Aries Framework JavaScript)
implementation 'net.java.dev.jna:jna:5.2.0'


// Flipper debugger
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group: "com.facebook.fbjni"
Expand Down
4 changes: 2 additions & 2 deletions source/prj/android/app/src/dev/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.mendix.nativetemplate">
<application android:name="com.mendix.nativetemplate.DevApplication" tools:replace="android:name">
<activity android:name="com.mendix.nativetemplate.MainActivity" android:screenOrientation="user" android:windowSoftInputMode="adjustPan" tools:replace="android:windowSoftInputMode" tools:node="merge"/>
<activity android:name="com.mendix.nativetemplate.MainActivity" android:screenOrientation="userPortrait" android:windowSoftInputMode="adjustPan" tools:replace="android:windowSoftInputMode" tools:node="merge"/>
<activity android:name="com.mendix.mendixnative.activity.MendixReactActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleInstance" android:windowSoftInputMode="adjustPan" android:exported="true"/>
</application>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="false" android:xlargeScreens="false"/>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true"/>
</manifest>
2 changes: 1 addition & 1 deletion source/prj/android/app/src/dev/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">FWOS Demo</string>
<string name="app_name">Dev-FWOS</string>
<string name="hint_app_url_input">Your local Mendix Studio Pro URL</string>
<string name="launch_app_button">Launch</string>
<string name="neutral_button">Continue</string>
Expand Down
20 changes: 6 additions & 14 deletions source/prj/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.mendix.nativetemplate">
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<!-- Remove the next line after update react-native-inappbrowser-->
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:node="remove" tools:ignore="QueryAllPackagesPermission"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<!-- Required for scheduling local notifications -->
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
<!-- If this app uses ads, remove 'tools:node="remove"' to enable ad ID access. -->
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<!-- entidad: begin -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="33" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="33" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- entidad: end -->
<!-- Mark the following features as required to filter out devices missing these features. See:
https://developer.android.com/guide/topics/manifest/uses-feature-element -->
<uses-feature android:name="android.hardware.camera" android:required="false"/>
Expand All @@ -46,7 +38,7 @@
</intent>
</queries>
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:largeHeap="true" android:theme="@style/AppTheme" android:requestLegacyExternalStorage="true">
<activity android:name="com.mendix.nativetemplate.MainActivity" android:label="@string/app_name" android:screenOrientation="user" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:windowSoftInputMode="adjustPan" android:exported="true" android:launchMode="singleTop">
<activity android:name="com.mendix.nativetemplate.MainActivity" android:label="@string/app_name" android:screenOrientation="userPortrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:windowSoftInputMode="adjustPan" android:exported="true" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand All @@ -55,5 +47,5 @@
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
<meta-data android:name="com.google.android.geo.API_KEY" android:value=""/>
</application>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="false" android:xlargeScreens="false"/>
</manifest>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true"/>
</manifest>
10,404 changes: 5,925 additions & 4,479 deletions source/prj/android/app/src/main/assets/index.android.bundle

Large diffs are not rendered by default.

Binary file modified source/prj/android/app/src/main/res/drawable-hdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/android/app/src/main/res/drawable-xhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/android/app/src/main/res/drawable-xxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 16 additions & 18 deletions source/prj/android/app/src/main/res/raw/native_dependencies.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{
"react-native-camera": "3.40.0",
"json-query": "^2.2.2",
"react-native-sensitive-info": "^6.0.0-alpha.9",
"react-native-argon2": "^2.0.1",
"react-native-crypto": "^2.2.0",
"react-native-localize": "1.4.2",
"@credo-ts/anoncreds": "^0.5.3",
"@credo-ts/askar": "^0.5.3",
"@credo-ts/core": "^0.5.3",
"@credo-ts/indy-vdr": "^0.5.3",
"@credo-ts/openid4vc": "^0.5.3",
"@credo-ts/react-native": "^0.5.3",
"@entidad/questionnaire": "git+http://github.com/entidad/credo-ts-survey.git",
"@hyperledger/anoncreds-react-native": "^0.2.2",
"@hyperledger/aries-askar-react-native": "^0.2.1",
"@hyperledger/indy-vdr-react-native": "^0.2.2",
"@animo-id/react-native-ble-didcomm": "0.8.0",
"@credo-ts/anoncreds": "0.5.9",
"@credo-ts/askar": "0.5.9",
"@credo-ts/core": "0.5.9",
"@credo-ts/indy-vdr": "0.5.9",
"@credo-ts/openid4vc": "0.5.9",
"@credo-ts/question-answer": "0.5.9",
"@credo-ts/react-native": "0.5.9",
"@credo-ts/transport-ble": "0.3.0",
"@hyperledger/anoncreds-react-native": "0.2.2",
"@hyperledger/aries-askar-react-native": "0.2.3",
"@hyperledger/indy-vdr-react-native": "0.2.2",
"base-64": "^1.0.0",
"credo-ts-media-sharing": "^0.0.1-alpha.9",
"react-native-fs": "^2.20.0",
"react-native-get-random-values": "^1.11.0",
"text-encoding": "^0.7.0"
"credo-ts-didweb-anoncreds": "git+http://github.com/Entidad/credo-ts-didweb-anoncreds.git",
"react-native-fs": "2.20.0",
"react-native-get-random-values": "1.11.0",
"text-encoding": "0.7.0"
}
2 changes: 1 addition & 1 deletion source/prj/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">FWOS Demo</string>
<string name="app_name">FWOS</string>
</resources>
22 changes: 9 additions & 13 deletions source/prj/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@

buildscript {
ext {
buildToolsVersion = "31.0.0"
buildToolsVersion = "34.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
targetSdkVersion = 34
kotlin_version = "1.7.21"
excludeAppGlideModule = true
androidx_lifecycle_version = "2.3.1"
playServicesVersion = "18+"
firebaseMessagingVersion = "21.0.0"
androidXCore = "1.6.0"
androidXBrowser = "1.2.0"
//Entidad
ndkVersion = "25.1.8937393"
}
repositories {
google()
Expand All @@ -39,14 +37,12 @@ buildscript {
allprojects {
repositories {
all { repo ->
if (repo.hasProperty('url')) {
println repo.url.toString()
if (repo.url.toString().contains("jcenter.bintray.com") || repo.url.toString().contains("jitpack.io")) {
project.logger.warn "Repository ${repo.url} removed."
remove repo
google()
mavenCentral()
}
println repo.url.toString()
if (repo.url.toString().contains("jcenter.bintray.com") || repo.url.toString().contains("jitpack.io")) {
project.logger.warn "Repository ${repo.url} removed."
remove repo
google()
mavenCentral()
}
}
exclusiveContent {
Expand Down
2 changes: 2 additions & 0 deletions source/prj/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ org.gradle.configureondemand=true
android.disableResourceValidation=true
FLIPPER_VERSION=0.125.0
android.suppressUnsupportedCompileSdk=33

hermesEnabled = false
2 changes: 1 addition & 1 deletion source/prj/appcenter-build-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"toolsets": {
"xcode": {
"xcodeVersion": "14.2",
"xcodeVersion": "15.1 Preview",
"automaticSigning": false,
"projectOrWorkspacePath": "ios/NativeTemplate.xcworkspace",
"podfilePath": "ios/Podfile",
Expand Down
Binary file modified source/prj/assets/splashScreens/drawable-hdpi-splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/assets/splashScreens/drawable-xhdpi-splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/assets/splashScreens/drawable-xxhdpi-splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/assets/splashScreens/splash@1x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/assets/splashScreens/splash@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/prj/assets/splashScreens/splash@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 90a185a

Please sign in to comment.