diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..371f2e2 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/easycode.ignore b/.idea/easycode.ignore new file mode 100644 index 0000000..be585df --- /dev/null +++ b/.idea/easycode.ignore @@ -0,0 +1,13 @@ +node_modules/ +dist/ +vendor/ +cache/ +.*/ +*.min.* +*.test.* +*.spec.* +*.bundle.* +*.bundle-min.* +*.*.js +*.*.ts +*.log diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d165b77..c061c67 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,11 +1,11 @@ + diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cda..b4bef83 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,4 @@ - - - - - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 0078f2c..c49ecf9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,12 @@ - - + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/Spanny.app.iml b/.idea/modules/app/Spanny.app.iml new file mode 100644 index 0000000..c3dcf44 --- /dev/null +++ b/.idea/modules/app/Spanny.app.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/Spanny.app.main.iml b/.idea/modules/app/Spanny.app.main.iml new file mode 100644 index 0000000..fee09b6 --- /dev/null +++ b/.idea/modules/app/Spanny.app.main.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/Spanny.app.unitTest.iml b/.idea/modules/app/Spanny.app.unitTest.iml new file mode 100644 index 0000000..d757d84 --- /dev/null +++ b/.idea/modules/app/Spanny.app.unitTest.iml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/spanny/Spanny.spanny.iml b/.idea/modules/spanny/Spanny.spanny.iml new file mode 100644 index 0000000..61e6a86 --- /dev/null +++ b/.idea/modules/spanny/Spanny.spanny.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/spanny/Spanny.spanny.main.iml b/.idea/modules/spanny/Spanny.spanny.main.iml new file mode 100644 index 0000000..5c43c9a --- /dev/null +++ b/.idea/modules/spanny/Spanny.spanny.main.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/spanny/Spanny.spanny.unitTest.iml b/.idea/modules/spanny/Spanny.spanny.unitTest.iml new file mode 100644 index 0000000..d135db7 --- /dev/null +++ b/.idea/modules/spanny/Spanny.spanny.unitTest.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..a76f118 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,329 @@ + + + + + + \ No newline at end of file diff --git a/Spanny.iml b/Spanny.iml index 5ef7902..77101b7 100644 --- a/Spanny.iml +++ b/Spanny.iml @@ -1,17 +1,10 @@ - - - - - - - + + diff --git a/app/build.gradle b/app/build.gradle index 6d06e57..6bfe5ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' - android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + namespace 'com.binaryfork.spannySample' + + compileSdkVersion 34 + //buildToolsVersion "22.0.1" defaultConfig { applicationId "com.binaryfork.spanny" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 34 versionCode 1 versionName "1.0" } @@ -20,7 +21,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - //compile project(':spanny') - compile 'com.binaryfork:spanny:1.0.3' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(':spanny') + //implementation 'com.binaryfork:spanny:1.0.4' + //implementation 'com.github.FazalHussain:Spanny:1.0.7' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 280c847..eb726a6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/main/java/com/binaryfork/spannysample/MainActivity.java b/app/src/main/java/com/binaryfork/spannysample/MainActivity.java index 5bba868..534862f 100644 --- a/app/src/main/java/com/binaryfork/spannysample/MainActivity.java +++ b/app/src/main/java/com/binaryfork/spannysample/MainActivity.java @@ -22,6 +22,7 @@ import android.widget.TextView; import com.binaryfork.spanny.Spanny; +import com.binaryfork.spannySample.R; public class MainActivity extends Activity { diff --git a/build.gradle b/build.gradle index d65675e..46bd025 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,18 @@ buildscript { repositories { - jcenter() + //jcenter() + maven { url "https://repo.grails.org/grails/core/" } + maven { url "https://jitpack.io" } + mavenCentral() + google() } + + dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:8.2.0' classpath 'com.github.dcendents:android-maven-plugin:1.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,6 +22,10 @@ buildscript { allprojects { repositories { - jcenter() + //jcenter() + maven { url "https://repo.grails.org/grails/core/" } + maven { url "https://jitpack.io" } + mavenCentral() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..9396a09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..94799a5 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,5 @@ +jdk: + - openjdk17 +before_install: + - sdk install java 17.0.11-open + - sdk use java 17.0.11-open \ No newline at end of file diff --git a/spanny/build.gradle b/spanny/build.gradle index 8e675dc..d78814f 100644 --- a/spanny/build.gradle +++ b/spanny/build.gradle @@ -1,13 +1,16 @@ apply plugin: 'com.android.library' +apply plugin: 'maven-publish' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + namespace 'com.binaryfork.spanny' + + compileSdkVersion 34 + //buildToolsVersion "22.0.1" resourcePrefix "spanny__" defaultConfig { minSdkVersion 8 - targetSdkVersion 22 + targetSdkVersion 34 versionCode 1 versionName "1.0.3" } @@ -20,7 +23,18 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) +} + +afterEvaluate { + publishing { + publications { + // Creates a Maven publication called "release". + release(MavenPublication) { + from components.findByName('release') + } + } + } } -apply from: 'bintray.gradle' \ No newline at end of file +apply plugin: "com.jfrog.bintray" \ No newline at end of file diff --git a/spanny/src/main/AndroidManifest.xml b/spanny/src/main/AndroidManifest.xml index f6760a9..8bdb7e1 100644 --- a/spanny/src/main/AndroidManifest.xml +++ b/spanny/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +