Skip to content

Commit

Permalink
Merge branch 'release/2.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
blavenie committed Aug 25, 2023
2 parents 9ff2704 + 4b70e9d commit a3023e9
Show file tree
Hide file tree
Showing 95 changed files with 23,248 additions and 1,879 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "net.sumaris.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 20501
versionName "2.5.1"
versionCode 20502
versionName "2.5.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest android:versionCode="20501" android:versionName="2.5.1" xmlns:android="http://schemas.android.com/apk/res/android"
<manifest android:versionCode="20502" android:versionName="2.5.2" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:exported="true" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="net.sumaris.app.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ "_$INSTALL_DIR" == "_" ]]; then
fi

latest_version() {
echo "2.5.1" #lastest
echo "2.5.2" #lastest
}

api_release_url() {
Expand Down
2 changes: 1 addition & 1 deletion ngx-sumaris-components
Submodule ngx-sumaris-components updated from 29b22e to 49f122
Loading

0 comments on commit a3023e9

Please sign in to comment.