diff --git a/.jitpack.yml b/.jitpack.yml new file mode 100644 index 0000000..46c8529 --- /dev/null +++ b/.jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk11 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0af5532..2b6ac7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion + defaultConfig { applicationId "example.simple.spiderman" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -34,6 +37,11 @@ android { } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + } dependencies { diff --git a/build.gradle b/build.gradle index 5ecb981..822337f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { google() jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath 'com.android.tools.build:gradle:7.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -20,6 +18,7 @@ allprojects { repositories { google() // jcenter() + mavenCentral() maven { url 'https://jitpack.io' } } } @@ -29,12 +28,12 @@ task clean(type: Delete) { } ext { - sm_version = "1.1.7" - sm_no_op_version = "1.1.5" + sm_version = "1.1.9" + sm_no_op_version = "1.1.9" - compileSdkVersion = 28 + compileSdkVersion = 30 minSdkVersion = 14 - targetSdkVersion = 28 + targetSdkVersion = 30 appcompat = "28.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3b303c9..211153c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 20 16:41:52 CST 2018 +#Tue Dec 03 11:10:12 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/spiderman-callback/build.gradle b/spiderman-callback/build.gradle index 1c36dd1..0f2bef6 100644 --- a/spiderman-callback/build.gradle +++ b/spiderman-callback/build.gradle @@ -1,15 +1,32 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'maven-publish' +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + } + } + } +} android { resourcePrefix "simple" - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion -// targetSdkVersion 27 + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/spiderman-libs/build.gradle b/spiderman-libs/build.gradle index 522b652..ef2e849 100644 --- a/spiderman-libs/build.gradle +++ b/spiderman-libs/build.gradle @@ -1,15 +1,32 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'maven-publish' +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + } + } + } +} android { resourcePrefix "simple" - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion -// targetSdkVersion 27 + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/spiderman-no-op/build.gradle b/spiderman-no-op/build.gradle index 7b83714..5636444 100644 --- a/spiderman-no-op/build.gradle +++ b/spiderman-no-op/build.gradle @@ -1,16 +1,32 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'maven-publish' +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + } + } + } +} android { resourcePrefix "simple" - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion -// targetSdkVersion 27 - + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/spiderman/build.gradle b/spiderman/build.gradle index 1c9bba6..2eb4e9e 100644 --- a/spiderman/build.gradle +++ b/spiderman/build.gradle @@ -1,15 +1,32 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'maven-publish' +} + +afterEvaluate { + publishing { + publications { + release(MavenPublication) { + from components.release + } + } + } +} android { resourcePrefix "simple" - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdkVersion defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion -// targetSdkVersion 27 + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies {