Skip to content

Commit

Permalink
Merge pull request #12 from beigirad/upgrade-project
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
beigirad committed Oct 30, 2020
2 parents 16b838f + 03cc276 commit 8b4ee12
Show file tree
Hide file tree
Showing 9 changed files with 248 additions and 263 deletions.
4 changes: 2 additions & 2 deletions build.gradle
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.30'
ext.kotlin_version = '1.4.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Expand Up @@ -9,6 +9,8 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m

# When configured, Gradle will run in incubating parallel mode.
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sun Feb 04 15:28:31 IRST 2018
#Fri Oct 30 16:00:58 IRST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
14 changes: 8 additions & 6 deletions library/build.gradle
@@ -1,18 +1,19 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.beigirad'


android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
targetSdkVersion 30

def majorVersion = 1
def minorVersion = 0
def patchVersion = 7
def minorVersion = 1
def patchVersion = 0

versionCode majorVersion * 10000 + minorVersion * 100 + patchVersion
versionName "$majorVersion.$minorVersion.$patchVersion"
Expand All @@ -29,5 +30,6 @@ android {
}

dependencies {
implementation 'com.android.support:appcompat-v7:28.0.0'
}
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "androidx.core:core-ktx:1.3.2"
}
222 changes: 0 additions & 222 deletions library/src/main/java/ir/beigirad/zigzagview/ZigzagView.java

This file was deleted.

0 comments on commit 8b4ee12

Please sign in to comment.