Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (36 commits)
  Updated versionCode, targetSdkVersion, compileSdkVersion and proguard-rules.
  Swipe to refresh implementation in Shares workspace.
  Updated google services plugin. Implemented copy and move between workspaces.
  Updated Java version, Gradle version, Gradle plugin. Removed deprecated libraries && plugins.
  Create deployStaging.yml
  Create release.yml
  Added copy record option to the Shares workspace.
  Implemented more options island menu in all workspaces.
  Implemented Save To Permanent for Shares workspace destination.
  Implemented COPY and MOVE for multiple files.
  Implemented Floating Action Island for select mode in all workspaces.
  Added confirmation dialog for tag deletion. Added spinner for tag deletion.
  Implementation of "Enter Select mode when tapping on Select button" for all workspaces.
  Increase Target API version from 32 to 33. Refactoring.
  Fixed a bug regarding crash when opening a photo. Upgraded build gradle tools. Refactoring.
  VSP-892 [Android] Manage Tags - search tag name
  Implemented Archive Settings dropdown menu and menu redesign.
  VSP-892 [Android] Manage Tags - search tag name
  VSP-889 [Android] Manage Tags - delete tag(s)
  Implemented Save To Permanent for Public Files workspace destination.
  ...
  • Loading branch information
flaviahandrea-vsp committed Jun 27, 2023
2 parents 5444452 + 60fc0b6 commit e7a7324
Show file tree
Hide file tree
Showing 207 changed files with 661,232 additions and 183,993 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/deployStaging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Deploy to Staging

on:
push:
branches: [ "feature/VSP-1192-Implement-CI-Server" ]
pull_request:
branches:
- "develop"
paths:
- ".github/workflows/deployStaging.yaml"

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Update Bundler
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6.8'
bundler-cache: true
- name: Run Fastlane Firebase
env:
GMP_KEY: ${{ secrets.GMP_KEY }}
AUTH_CLIENT_ID: ${{ secrets.AUTH_CLIENT_ID }}
AUTH_CLIENT_SECRET: ${{ secrets.AUTH_CLIENT_SECRET }}
PUBLISHABLE_KEY: ${{ secrets.PUBLISHABLE_KEY }}
run: bundler exec fastlane firebase
24 changes: 24 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Release to Play store

on:
push:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 28 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
Expand All @@ -15,9 +14,9 @@ android {
defaultConfig {
applicationId "org.permanent.PermanentArchive"
minSdkVersion 26
targetSdkVersion 32
versionCode 43
versionName "1.6.2"
targetSdkVersion 32 // If you update this version *upload* won't work without adjustments
versionCode 44
versionName "1.7.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -65,17 +64,22 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
dataBinding true
// compose true
}
//
// composeOptions {
// kotlinCompilerExtensionVersion = "1.4.7"
// }

lintOptions {
abortOnError false
Expand All @@ -84,12 +88,11 @@ android {
packagingOptions {
resources.excludes.add("META-INF/*")
}
namespace 'org.permanent.permanent'
}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
Expand All @@ -107,6 +110,22 @@ dependencies {
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation 'androidx.fragment:fragment-ktx:1.4.1'
//==============================================================================================
//
// //====================================== JETPACK COMPOSE =======================================
// implementation 'androidx.compose.material3:material3:1.1.0'
// // Android Studio Preview support
// implementation 'androidx.compose.ui:ui-tooling-preview:1.4.3'
// implementation 'androidx.compose.ui:ui-tooling:1.4.3'
// // Integration with activities
// implementation 'androidx.activity:activity-compose:1.7.2'
// // Integration with ViewModels
// implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
// // Integration with LiveData
// implementation 'androidx.compose.runtime:runtime-livedata:1.4.3'
// // UI Tests
//// androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
//// debugImplementation 'androidx.compose.ui:ui-test-manifest'
// //==============================================================================================

//====================================== MATERIAL COMPONENTS ===================================
implementation 'com.google.android.material:material:1.5.0'
Expand Down
Loading

0 comments on commit e7a7324

Please sign in to comment.