Skip to content

Commit f7807cd

Browse files
committed
Major release with bug fixes and new features
2 parents ab440f5 + 246fe60 commit f7807cd

10 files changed

+195
-180
lines changed

.github/workflows/gradle-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
arguments: build
3636

3737
# The USERNAME and TOKEN need to correspond to the credentials environment variables used in
38-
# the publishing section of your build.gradle
38+
# the publishing section of your build.gradle.kts
3939
- name: Publish to GitHub Packages
4040
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
4141
with:

app/build.gradle app/build.gradle.kts

+59-57
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-kapt'
4-
apply plugin: 'kotlin-parcelize'
5-
apply plugin: 'com.spotify.ruler'
1+
//apply plugin: 'com.android.application'
2+
//apply plugin: 'kotlin-android'
3+
//apply plugin: 'kotlin-kapt'
4+
//apply plugin: 'kotlin-parcelize'
5+
////apply plugin: 'com.spotify.ruler'
6+
7+
plugins {
8+
id("com.android.application")
9+
id("org.jetbrains.kotlin.android")
10+
id("kotlin-android")
11+
id("kotlin-kapt")
12+
id("kotlin-parcelize")
13+
}
614

715
android {
8-
compileSdkVersion 34
16+
namespace = "com.rajat.sample.pdfviewer"
17+
18+
compileSdk = 34
919

1020
defaultConfig {
11-
applicationId "com.rajat.sample.pdfviewer"
12-
minSdkVersion 21
13-
targetSdkVersion 34
14-
versionCode 2
15-
versionName "1.1"
16-
multiDexEnabled true
17-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
21+
applicationId = "com.rajat.sample.pdfviewer"
22+
minSdk = 21
23+
targetSdk = 34
24+
versionCode = 2
25+
versionName = "1.1"
26+
multiDexEnabled = true
27+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1828
vectorDrawables {
19-
useSupportLibrary true
29+
useSupportLibrary = true
2030
}
2131
}
2232

2333
buildFeatures {
24-
viewBinding true
25-
compose true
26-
}
27-
viewBinding {
28-
enabled = true
34+
viewBinding = true
35+
compose = true
2936
}
37+
3038
compileOptions {
31-
sourceCompatibility JavaVersion.VERSION_17
32-
targetCompatibility JavaVersion.VERSION_17
39+
sourceCompatibility = JavaVersion.VERSION_17
40+
targetCompatibility = JavaVersion.VERSION_17
3341
}
3442

3543
kotlinOptions {
@@ -45,38 +53,40 @@ android {
4553
}
4654

4755
buildTypes {
48-
release {
49-
minifyEnabled false
50-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
51-
}
52-
}
53-
namespace 'com.rajat.sample.pdfviewer'
54-
packaging {
55-
resources {
56-
excludes += '/META-INF/{AL2.0,LGPL2.1}'
56+
buildTypes {
57+
release {
58+
isMinifyEnabled = false
59+
proguardFiles(
60+
getDefaultProguardFile("proguard-android-optimize.txt"),
61+
"proguard-rules.pro"
62+
)
63+
}
5764
}
5865
}
5966
}
6067

6168
dependencies {
62-
implementation fileTree(dir: "libs", include: ["*.jar"])
63-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
64-
implementation 'androidx.core:core-ktx:1.12.0'
65-
implementation 'androidx.appcompat:appcompat:1.6.1'
66-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
67-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
68-
implementation platform('androidx.compose:compose-bom:2023.03.00')
69-
implementation 'androidx.compose.ui:ui-graphics'
70-
testImplementation 'junit:junit:4.13.2'
71-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
72-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
73-
implementation 'com.android.support:multidex:2.0.0'
74-
implementation project(":pdfViewer")
75-
76-
testImplementation 'androidx.test:core:1.5.0'
77-
androidTestImplementation 'androidx.test:runner:1.5.2'
78-
androidTestImplementation 'androidx.test:rules:1.5.0'
79-
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
69+
70+
val kotlin_version = "1.9.20"
71+
72+
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
73+
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
74+
implementation("androidx.core:core-ktx:1.12.0")
75+
implementation("androidx.appcompat:appcompat:1.6.1")
76+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
77+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
78+
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
79+
implementation("androidx.compose.ui:ui-graphics")
80+
testImplementation("junit:junit:4.13.2")
81+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
82+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
83+
implementation("com.android.support:multidex:2.0.0")
84+
implementation(project(":pdfViewer"))
85+
86+
testImplementation("androidx.test:core:1.5.0")
87+
androidTestImplementation("androidx.test:runner:1.5.2")
88+
androidTestImplementation("androidx.test:rules:1.5.0")
89+
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.5")
8090

8191

8292
// compose
@@ -96,7 +106,7 @@ dependencies {
96106

97107
// Android Studio Preview support
98108
implementation("androidx.compose.ui:ui-tooling-preview")
99-
androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00')
109+
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
100110
debugImplementation("androidx.compose.ui:ui-tooling")
101111

102112
// UI Tests
@@ -120,12 +130,4 @@ dependencies {
120130
implementation("androidx.compose.runtime:runtime-livedata")
121131
// Optional - Integration with RxJava
122132
implementation("androidx.compose.runtime:runtime-rxjava2")
123-
124133
}
125-
126-
ruler {
127-
abi.set("arm64-v8a")
128-
locale.set("en")
129-
screenDensity.set(480)
130-
sdkVersion.set(27)
131-
}

app/proguard-rules.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

build.gradle

-27
This file was deleted.

build.gradle.kts

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
buildscript {
3+
repositories {
4+
google()
5+
mavenCentral()
6+
}
7+
dependencies {
8+
classpath("com.spotify.ruler:ruler-gradle-plugin:2.0.0-alpha-13")
9+
}
10+
}
11+
12+
13+
plugins {
14+
id("com.android.application") version "8.1.4" apply false
15+
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
16+
}
17+
18+
19+
20+
tasks.register("clean",Delete::class){
21+
delete(rootProject.buildDir)
22+
}

pdfViewer/build.gradle

-90
This file was deleted.

0 commit comments

Comments
 (0)