Merge pull request #10 from zeoflow/android-4.0-override

Min SDK 21

Author: teogor

.gitignore

@@ -6,6 +6,7 @@
 /build
 /captures
 /.idea
+[Bb]uild
 
 *.iml
 stylar/stylar.gpg

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.akarnokd:ixjava:1.0.0'
         classpath 'commons-io:commons-io:2.6'
@@ -43,6 +43,7 @@ ext {
     targetSdkVersion = 30
     versionCode = 1
     versionName = "1.0.0"
+    ndk = "21.3.6528147"
 
     ANNOTATIONS = 'org.jetbrains:annotations-java5:17.0.0'
 

sample/build.gradle

@@ -37,28 +37,10 @@ configurations.all {
 
 dependencies {
 	implementation fileTree(dir: "libs", include: ["*.jar"])
+	implementation project(':stylar')
 
-	implementation 'androidx.annotation:annotation:1.1.0'
 	implementation 'androidx.appcompat:appcompat:1.2.0'
-	implementation 'androidx.browser:browser:1.2.0'
-	implementation 'androidx.cardview:cardview:1.0.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-	implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-	implementation 'androidx.core:core:1.3.1'
-	implementation 'androidx.exifinterface:exifinterface:1.3.0'
-	implementation 'androidx.annotation:annotation-experimental:1.0.0'
-	implementation 'androidx.fragment:fragment:1.2.5'
-	implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
-	implementation 'androidx.recyclerview:recyclerview:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview-selection:1.0.0'
-	implementation 'androidx.transition:transition:1.4.0-beta01'
-	implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-	implementation 'androidx.viewpager2:viewpager2:1.0.0'
-
 	implementation 'com.atlassian.commonmark:commonmark:0.13.0'
-
 	implementation 'com.github.bumptech.glide:glide:4.11.0'
 
-	implementation project(':stylar')
-
 }

settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'StylarLib'
-include ':stylar'
 
+include ':stylar'
 include ':sample'

stylar/build.gradle

@@ -9,8 +9,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-
     }
     buildTypes {
         release {
@@ -35,24 +33,8 @@ configurations.all {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.browser:browser:1.2.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-    implementation 'androidx.core:core:1.3.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.0'
-    implementation 'androidx.annotation:annotation-experimental:1.0.0'
-    implementation 'androidx.fragment:fragment:1.2.5'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview-selection:1.0.0'
-    implementation 'androidx.transition:transition:1.4.0-beta01'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
-
-    implementation 'ru.noties:jlatexmath-android:0.2.0'
+    implementation 'com.zeoflow:zson:1.2.1'
+    implementation 'com.zeoflow:material-elements:2.1.0'
 
     implementation 'io.coil-kt:coil:0.12.0'
     implementation 'io.coil-kt:coil-base:0.12.0'
@@ -65,25 +47,17 @@ dependencies {
     implementation 'com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0'
     implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0'
 
-    implementation 'junit:junit:4.13'
-
-    implementation 'com.github.akarnokd:ixjava:1.0.0'
 
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.20'
+    implementation 'ru.noties:jlatexmath-android:0.2.0'
+    implementation 'junit:junit:4.13'
+    implementation 'com.github.akarnokd:ixjava:1.0.0'
     implementation 'com.caverock:androidsvg:1.4'
-
-    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
-
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.github.akarnokd:ixjava:1.0.0'
-
-    implementation 'com.zeoflow:zson:1.0.0'
-
     implementation 'commons-io:commons-io:2.6'
-
     implementation 'org.jetbrains:annotations-java5:17.0.0'
-
     implementation 'com.google.googlejavaformat:google-java-format:1.6'
-
     implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
 }

stylar/maven-push.gradle

@@ -40,6 +40,8 @@ def getRepositoryPassword() {
 }
 
 afterEvaluate { project ->
+  project.generateDebugBuildConfig.enabled = false
+  project.generateReleaseBuildConfig.enabled = false
   uploadArchives {
     repositories {
       mavenDeployer {