Skip to content

Commit

Permalink
Merge pull request #2389 from fossasia/development
Browse files Browse the repository at this point in the history
fix: Google play console issues
  • Loading branch information
CloudyPadmal authored Feb 26, 2024
2 parents 575cc3d + 9b993c0 commit d45baf0
Show file tree
Hide file tree
Showing 126 changed files with 1,625 additions and 2,216 deletions.
19 changes: 9 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
**Fixes** #<!-- Add issue number here. This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber" -->
Fixes #<!-- Add issue number here. This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber" -->

**Changes**:
- <!-- Add here what changes were made in this issue and if possible provide links. -->
## Changes
- <!-- Add here what changes were made in this pull request and if possible provide links. -->

**Screen shots for the changes**:
<!-- Add screen shots/screen recordings of the layout where you made changes or a `*.gif` containing a demonstration -->
## Screenshots / Recordings
<!-- Add screen shots/screen recordings of the layout where you made changes or a `*.gif` containing a demonstration. Fill "> N/A" if the change is not a UI fix. -->

**Checklist**: <!-- Please tick following check boxes with `[x]` if the respective task is completed -->
- [ ] I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard-coding any value.
- [ ] No modifications done at the end of resource files `strings.xml`, `dimens.xml` or `colors.xml`.
- [ ] I have reformatted code and fixed indentation in every file included in this pull request
- [ ] My code does not contain any extra lines or extra spaces.
- [ ] I have requested reviews from maintainers.
- [ ] **No hard coding**: I have used resources from `strings.xml`, `dimens.xml` and `colors.xml` without hard coding any value.
- [ ] **No end of file edits**: No modifications done at end of resource files `strings.xml`, `dimens.xml` or `colors.xml`.
- [ ] **Code reformatting**: I have reformatted code and fixed indentation in every file included in this pull request.
- [ ] **No extra space**: My code does not contain any extra lines or extra spaces than the ones that are necessary.
8 changes: 7 additions & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ categories:
- title: ':bug: Bug Fixes'
label: 'Fix'
- title: ':wrench: Maintenance'
label: 'Chore'
labels:
- 'Chore'
- title: ':page_facing_up: Documentation'
label: 'Documentation'
change-template: '- $TITLE (#$NUMBER) - @$AUTHOR'
exclude-contributors:
- 'dependabot'
- 'dependabot[bot]'
exclude-labels:
- 'Dependencies'
template: |-
## Changes
$CHANGES
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,21 @@ jobs:

steps:
- name: Download repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
java-version: '17'

- name: Build with Gradle
run: |
bash ./gradlew build --stacktrace
- name: Store APK file
uses: actions/upload-artifact@v3
with:
name: apk-files
path: |
app/build/outputs/apk/debug/app-debug.apk
12 changes: 6 additions & 6 deletions .github/workflows/push-event.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:

steps:
- name: Download repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
java-version: '17'

- name: Build with Gradle
run: |
bash ./gradlew build --stacktrace
bash ./gradlew bundle --stacktrace
- name: Store APK files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: apk-files
path: |
Expand All @@ -50,7 +50,7 @@ jobs:

steps:
- name: Clone APK branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: fossasia/pslab-android
ref: apk
Expand All @@ -72,7 +72,7 @@ jobs:
rm -rf app-release-development.aab || true
- name: Retrieve APK files
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: apk-files

Expand Down
129 changes: 0 additions & 129 deletions app/build.gradle

This file was deleted.

111 changes: 111 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
plugins {
id("com.android.application")
}

apply(plugin = "realm-android")

val keystoreExists = System.getenv("KEYSTORE_FILE") != null

android {
namespace = "io.pslab"
compileSdk = 34

defaultConfig {
applicationId = "io.pslab"
minSdk = 31
targetSdk = 34
versionCode = 22
versionName = "3.1.0"
}

signingConfigs {
if (keystoreExists) {
register("release") {
storeFile = file(System.getenv("KEYSTORE_FILE"))
storePassword = System.getenv("STORE_PASS")
keyAlias = System.getenv("ALIAS")
keyPassword = System.getenv("KEY_PASS")
}
}
}

buildTypes {
debug {
versionNameSuffix = "Version: "
resValue("string", "version", "${versionNameSuffix}${defaultConfig.versionName}")
}
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android.txt"),
"proguard-rules.pro"
)
resValue("string", "version", "${defaultConfig.versionName}")
signingConfig = if (keystoreExists) signingConfigs.getByName("release") else null
}
}
lint {
abortOnError = false
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}


dependencies {

// Android stock libraries
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.cardview:cardview:1.0.0")
implementation("androidx.recyclerview:recyclerview:1.3.2")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.preference:preference:1.2.1")
implementation("androidx.browser:browser:1.7.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")

// Custom tools libraries
implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
implementation("com.github.bmelnychuk:atv:1.2.9")
implementation("de.hdodenhof:circleimageview:3.1.0")
implementation("com.github.devlight.navigationtabstrip:navigationtabstrip:1.0.4")
implementation("com.afollestad.material-dialogs", "commons", "0.9.6.0")
implementation("com.github.medyo:android-about-page:1.3.1")
implementation("com.github.tiagohm.MarkdownView:library:0.19.0")
implementation("com.github.mirrajabi:search-dialog:1.2.4")
implementation("com.sdsmdg.harjot:croller:1.0.7")
implementation("com.github.BeppiMenozzi:Knob:1.9.0")
implementation("com.github.warkiz.widget:indicatorseekbar:2.1.2")
implementation("com.github.Vatican-Cameos:CarouselPicker:1.2")
implementation("com.github.anastr:speedviewlib:1.6.1")
implementation("com.github.GoodieBag:ProtractorView:v1.2")
implementation("com.github.Triggertrap:SeekArc:v1.1")

// Apache commons
implementation("org.apache.commons:commons-math3:3.6.1")
implementation("org.apache.commons:commons-lang3:3.14.0")

// Picasso
implementation("com.squareup.picasso:picasso:2.71828")

// OKHTTP
implementation("com.squareup.okhttp3:okhttp:4.9.3")

// ButterKnife
val butterKnifeVersion = "10.2.3"
annotationProcessor("com.jakewharton:butterknife-compiler:$butterKnifeVersion")
implementation("com.jakewharton:butterknife:$butterKnifeVersion")

// Map libraries
implementation("org.osmdroid:osmdroid-android:6.1.18")
implementation("org.osmdroid:osmdroid-mapsforge:6.1.18")
implementation("org.osmdroid:osmdroid-geopackage:6.1.18") {
exclude("org.osmdroid.gpkg");
exclude("ormlite-core");
exclude("com.j256.ormlite");
}

// Realm
implementation("io.realm:android-adapters:4.0.0")
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# By default, the flags in this file are appended to flags specified
# in /home/viveksb007/Android/Sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
# directive in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
Loading

0 comments on commit d45baf0

Please sign in to comment.