Major release with bug fixes and new features

afreakyelf · Nov 29, 2023 · 3f06884 · 3f06884
2 parents 75ca401 + 019f50f
commit 3f06884
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 60 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,13 +1,6 @@
-//apply plugin: 'com.android.application'
-//apply plugin: 'kotlin-android'
-//apply plugin: 'kotlin-kapt'
-//apply plugin: 'kotlin-parcelize'
-////apply plugin: 'com.spotify.ruler'
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("kotlin-android")
     id("kotlin-kapt")
     id("kotlin-parcelize")
 }
@@ -36,17 +29,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
 
-    kotlin {
-        jvmToolchain(17)
-    }
+//    kotlin {
+//        jvmToolchain(17)
+//    }
 
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.4"
@@ -63,6 +57,11 @@ android {
             }
         }
     }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
 }
 
 dependencies {
@@ -106,7 +105,7 @@ dependencies {
 
     // Android Studio Preview support
     implementation("androidx.compose.ui:ui-tooling-preview")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
     debugImplementation("androidx.compose.ui:ui-tooling")
 
     // UI Tests

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,22 +1,6 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-//buildscript {
-//    repositories {
-//        google()
-//        mavenCentral()
-//    }
-//    dependencies {
-//        classpath("com.spotify.ruler:ruler-gradle-plugin:2.0.0-alpha-13")
-//    }
-//}
-
 
 plugins {
     id("com.android.application") version "8.1.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.20" apply false
+    id("com.android.library") version "8.1.1" apply false
 }
-
-
-
-tasks.register("clean",Delete::class){
-    delete(rootProject.buildDir)
-}
diff --git a/pdfViewer/build.gradle.kts b/pdfViewer/build.gradle.kts
@@ -1,34 +1,35 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("kotlin-android")
-    id("maven-publish")
     id("kotlin-parcelize")
+    id("maven-publish")
 }
 
-
 android {
-    compileSdk = 34
     namespace = "com.rajat.pdfviewer"
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
     }
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
-
     kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    kotlin {
-        jvmToolchain(17)
+        jvmTarget = "1.8"
     }
 
     buildFeatures {
@@ -39,16 +40,6 @@ android {
         kotlinCompilerExtensionVersion = "1.5.4"
     }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
 }
 
 dependencies {
@@ -84,10 +75,8 @@ dependencies {
 
 publishing {
     publications {
-        register<MavenPublication>("release") {
-            afterEvaluate {
-                from(components["release"])
-            }
+        create<MavenPublication>("maven") {
+            from(components.findByName("release"))
         }
     }
 }