Skip to content

Commit 9f3de86

Browse files
authored
Merge pull request #6 from HellBus1/ci/release-preparation
Ci/release preparation
2 parents 165db03 + 0e55d2b commit 9f3de86

8 files changed

Lines changed: 65 additions & 11 deletions

File tree

.github/workflows/android_ci.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: VentNote Build and Test CI
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
test:
9+
name: Run Unit Tests
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Set up JDK 18
15+
uses: actions/setup-java@v3
16+
with:
17+
java-version: '18'
18+
distribution: 'adopt'
19+
cache: gradle
20+
21+
- name: Unit tests
22+
run: bash ./gradlew test --stacktrace
23+
24+
build:
25+
runs-on: ubuntu-latest
26+
permissions:
27+
contents: read
28+
packages: write
29+
30+
steps:
31+
- uses: actions/checkout@v3
32+
- name: Set up JDK 18
33+
uses: actions/setup-java@v3
34+
with:
35+
java-version: '18'
36+
distribution: 'adopt'
37+
cache: gradle
38+
39+
- name: Build debug APK
40+
run: bash ./gradlew assembleDebug --stacktrace

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4+
/.idea
45
/.idea/caches
56
/.idea/libraries
67
/.idea/modules.xml

.idea/other.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ plugins {
33
id 'org.jetbrains.kotlin.android'
44
id 'com.google.dagger.hilt.android'
55
id 'kotlin-kapt'
6-
id 'com.google.gms.google-services'
7-
id 'com.google.firebase.crashlytics'
6+
7+
// disable for staging purpose
8+
// id 'com.google.gms.google-services'
9+
// id 'com.google.firebase.crashlytics'
810
}
911

1012
android {
@@ -15,8 +17,8 @@ android {
1517
applicationId "com.digiventure.ventnote"
1618
minSdk 21
1719
targetSdk 33
18-
versionCode 1
19-
versionName "1.0"
20+
versionCode 2
21+
versionName "1.0.0"
2022

2123
testInstrumentationRunner "com.digiventure.utils.CustomTestRunner"
2224
vectorDrawables {
@@ -26,10 +28,12 @@ android {
2628

2729
buildTypes {
2830
release {
29-
minifyEnabled false
31+
minifyEnabled true
32+
debuggable false
3033
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3134
}
3235
debug {
36+
minifyEnabled true
3337
debuggable true
3438
signingConfig signingConfigs.debug
3539
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

app/release/app-release.aab

2.68 MB
Binary file not shown.

app/release/vent-release.aab

2.68 MB
Binary file not shown.

app/src/main/java/com/digiventure/ventnote/feature/notes/components/AppBar.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,12 @@ fun LeadingIcon(isMarking: Boolean, closeMarkingCallback: () -> Unit, toggleDraw
167167
TopNavBarIcon(Icons.Filled.Close, stringResource(R.string.close_nav_icon), Modifier.semantics { }) {
168168
closeMarkingCallback()
169169
}
170-
} else {
171-
TopNavBarIcon(Icons.Filled.Menu, stringResource(R.string.drawer_nav_icon), Modifier.semantics { }) {
172-
toggleDrawerCallback()
173-
}
174170
}
171+
// else {
172+
// TopNavBarIcon(Icons.Filled.Menu, stringResource(R.string.drawer_nav_icon), Modifier.semantics { }) {
173+
// toggleDrawerCallback()
174+
// }
175+
// }
175176
}
176177

177178
@Composable

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ buildscript {
33
compose_version = '1.2.0'
44
}
55
dependencies {
6-
classpath 'com.google.gms:google-services:4.3.15'
76
classpath 'com.android.tools.build:gradle:3.4.0'
8-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
7+
8+
// disable for staging purpose
9+
// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
10+
// classpath 'com.google.gms:google-services:4.3.15'
911
}
1012
}
1113
// Top-level build file where you can add configuration options common to all sub-projects/modules.

0 commit comments

Comments
 (0)