diff --git a/build.gradle b/build.gradle index ba80a73..e6874c9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,31 +1,17 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { - ext.kotlin_version = '1.4.0' - repositories { - maven { - url 'https://maven.google.com/' - name 'Google' - } + mavenCentral() google() jcenter() } dependencies { - 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.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' + classpath 'com.android.tools.build:gradle:4.1.3' } } allprojects { repositories { - maven { url 'https://maven.fabric.io/public' } - maven { url 'https://jitpack.io' } mavenCentral() google() jcenter() @@ -38,9 +24,9 @@ task clean(type: Delete) { ext { compileSdkVersion = 30 - buildToolsVersion = '30.0.1' + buildToolsVersion = '30.0.3' minSdkVersion = 21 targetSdkVersion = 30 - versionCode = 3 - versionName = "1.1.0" + versionCode = 1 + versionName = "1.0.0" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 05ef18d..61d5d41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,20 +4,4 @@ org.gradle.jvmargs=-Xmx5g -Dfile.encoding=UTF-8 org.gradle.configureondemand=true android.useAndroidX=true -android.enableJetifier=true -android.enableBuildCache=true -android.buildCacheDir=build/pre-dex-cache - -VERSION_NAME=4.6.0 - -GROUP=io.noties.stylar -POM_DESCRIPTION=Markwon markdown for Android -POM_URL=https://github.com/noties/Markwon -POM_SCM_URL=https://github.com/noties/Markwon -POM_SCM_CONNECTION=scm:git:git://github.com/noties/Markwon.git -POM_SCM_DEV_CONNECTION=scm:git:git://github.com/noties/Markwon.git -POM_LICENCE_NAME=The Apache Software License, Version 2.0 -POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt -POM_LICENCE_DIST=repo -POM_DEVELOPER_ID=noties -POM_DEVELOPER_NAME=Dimitry Ivanov \ No newline at end of file +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4e1cc9d..567f0db 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Apr 10 12:21:09 EEST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/sample/build.gradle b/sample/build.gradle index 71430f7..c91b9dc 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,4 +1,6 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -27,13 +29,8 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) implementation project(':stylar') - implementation ('com.zeoflow:flow-kit:1.1.0') { + implementation ('com.zeoflow:flow-kit:1.4.1') { exclude group: 'com.zeoflow', module: 'stylar' } - - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.atlassian.commonmark:commonmark:0.13.0' - implementation 'com.github.bumptech.glide:glide:4.11.0' } diff --git a/sample/src/main/java/com/zeoflow/stylar/sample/MainActivity.java b/sample/src/main/java/com/zeoflow/stylar/sample/MainActivity.java index 2f923de..161f2ae 100644 --- a/sample/src/main/java/com/zeoflow/stylar/sample/MainActivity.java +++ b/sample/src/main/java/com/zeoflow/stylar/sample/MainActivity.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.zeoflow.compat.ActivityCore; +import com.zeoflow.app.Activity; import com.zeoflow.stylar.AbstractStylarPlugin; import com.zeoflow.stylar.Stylar; import com.zeoflow.stylar.core.StylarTheme; @@ -17,7 +17,7 @@ import static com.zeoflow.stylar.view.StylarView.ALIGNMENT_LEFT; import static com.zeoflow.utils.FileUtil.readFile; -public class MainActivity extends ActivityCore +public class MainActivity extends Activity { @Override diff --git a/stylar/build.gradle b/stylar/build.gradle index 2d199b7..ed4d2f5 100644 --- a/stylar/build.gradle +++ b/stylar/build.gradle @@ -1,5 +1,6 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' +} android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -27,36 +28,32 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.zeoflow:zson:1.2.2' - implementation 'com.zeoflow:material-elements:2.1.0' - implementation ('com.zeoflow:flow-kit:1.1.0') { + implementation 'com.zeoflow:zson:1.3.0' + implementation 'com.zeoflow:material-elements:2.4.1' + implementation ('com.zeoflow:flow-kit:1.4.1') { exclude group: 'com.zeoflow', module: 'stylar' } - implementation 'io.coil-kt:coil:0.12.0' - implementation 'io.coil-kt:coil-base:0.12.0' + implementation 'io.coil-kt:coil:1.1.1' + implementation 'io.coil-kt:coil-base:1.1.1' - // soon -> replace with zeoflow's image library implementation 'com.squareup.picasso:picasso:2.71828' - implementation 'com.github.bumptech.glide:glide:4.11.0' + implementation 'com.github.bumptech.glide:glide:4.12.0' implementation 'com.atlassian.commonmark:commonmark:0.13.0' 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.2' 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.9.0' + implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2' implementation 'com.github.akarnokd:ixjava:1.0.0' implementation 'commons-io:commons-io:2.6' implementation 'com.google.googlejavaformat:google-java-format:1.6' implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' - } apply from: "${rootProject.projectDir}/stylar/maven-push.gradle"