diff --git a/build.gradle b/build.gradle index 0845a3d..8ba3c65 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,13 @@ buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = "1.4.10" repositories { google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0-alpha06' + classpath "com.android.tools.build:gradle:4.2.0-alpha14" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -20,3 +19,7 @@ allprojects { jcenter() } } + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd7237a..ffcec97 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-4-bin.zip diff --git a/library/build.gradle b/library/build.gradle index ede787f..f20f2f5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,8 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'com.github.dcendents.android-maven' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'maven-publish' +} repositories { mavenCentral() @@ -13,62 +15,47 @@ group = 'com.github.jitpack' version = '1.0' android { - compileSdkVersion 29 - buildToolsVersion "28.0.3" + compileSdkVersion 30 defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 - versionName version - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + versionName "1.0" } + buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - lintOptions { - abortOnError false + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - androidTest.java.srcDirs += 'src/androidTest/kotlin' - androidTest.resources.srcDirs += 'src/androidTest/res' + kotlinOptions { + jvmTarget = '1.8' } } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - - implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} - -task sourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -task classesJar(type: Jar) { - from "$buildDir/intermediates/classes/release" -} - -artifacts { - archives classesJar - archives javadocJar - archives sourcesJar + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' +} + +afterEvaluate { + publishing { + publications { + // Creates a Maven publication called "release". + release(MavenPublication) { + from components.release + groupId = 'com.github.jitpack' + artifactId = 'android-example' + version = '1.0' + } + } + } }