Skip to content

Commit

Permalink
Update version
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnaud Caillet committed Oct 25, 2023
1 parent 3f3cc58 commit 2aa3fab
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 84 deletions.
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,6 +19,10 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

Expand Down
18 changes: 9 additions & 9 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "21.1.2"
compileSdkVersion 33
buildToolsVersion "34.0.0"

defaultConfig {
applicationId "tileview.demo"
minSdkVersion 11
targetSdkVersion 23
minSdkVersion 21
targetSdkVersion 33
versionCode 1
versionName "1.0"
}
Expand All @@ -23,9 +23,9 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile project(':tileview')
testImplementation 'junit:junit:4.12'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':tileview')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
}
12 changes: 6 additions & 6 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name=".MainActivity" >
<activity android:name=".MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".BuildingPlansTileViewActivity" />
<activity android:name=".FictionalMapTileViewActivity" />
<activity android:name=".LargeImageTileViewActivity" />
<activity android:name=".RealMapTileViewActivity" />
<activity android:name=".RealMapInternetTileViewActivity" />
<activity android:name=".BuildingPlansTileViewActivity" android:exported="false"/>
<activity android:name=".FictionalMapTileViewActivity" android:exported="false"/>
<activity android:name=".LargeImageTileViewActivity" android:exported="false"/>
<activity android:name=".RealMapTileViewActivity" android:exported="false"/>
<activity android:name=".RealMapInternetTileViewActivity" android:exported="false"/>
</application>

</manifest>
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 26 20:44:34 CDT 2016
#Wed Oct 25 10:22:11 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
110 changes: 55 additions & 55 deletions tileview/aar-release.gradle
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
// credit https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle
// run ./gradlew clean build generateRelease

apply plugin: 'maven'

def groupId = 'com.qozix'
def artifactId = 'tileview'
def version = android.defaultConfig.versionName

def localReleaseDest = "${buildDir}/release/${version}"

task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
classpath += files(ext.androidJar)
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
classifier = 'javadoc'
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.srcDirs
}

uploadArchives {
repositories.mavenDeployer {
pom.groupId = groupId
pom.artifactId = artifactId
pom.version = version
// Add other pom properties here if you want (developer details / licenses)
repository(url: "file://${localReleaseDest}")
}
}

task zipRelease(type: Zip) {
from localReleaseDest
destinationDir buildDir
archiveName "release-${version}.zip"
}

task generateRelease << {
println "Release ${version} can be found at ${localReleaseDest}/"
println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
}

generateRelease.dependsOn(uploadArchives)
generateRelease.dependsOn(zipRelease)

artifacts {
archives androidSourcesJar
//archives androidJavadocsJar
}
//// credit https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle
//// run ./gradlew clean build generateRelease
//
//apply plugin: 'maven-publish'
//
//def groupId = 'com.qozix'
//def artifactId = 'tileview'
//def version = android.defaultConfig.versionName
//
//def localReleaseDest = "${buildDir}/release/${version}"
//
//task androidJavadocs(type: Javadoc) {
// source = android.sourceSets.main.java.srcDirs
// ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
// classpath += files(ext.androidJar)
//}
//
//task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
// classifier = 'javadoc'
// from androidJavadocs.destinationDir
//}
//
//task androidSourcesJar(type: Jar) {
// classifier = 'sources'
// from android.sourceSets.main.java.srcDirs
//}
//
////uploadArchives {
//// repositories.mavenDeployer {
//// pom.groupId = groupId
//// pom.artifactId = artifactId
//// pom.version = version
//// // Add other pom properties here if you want (developer details / licenses)
//// repository(url: "file://${localReleaseDest}")
//// }
////}
//
//task zipRelease(type: Zip) {
// from localReleaseDest
// destinationDir buildDir
// archiveName "release-${version}.zip"
//}
//
////task generateRelease << {
//// println "Release ${version} can be found at ${localReleaseDest}/"
//// println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
////}
//
////generateRelease.dependsOn(uploadArchives)
////generateRelease.dependsOn(zipRelease)
//
//artifacts {
// archives androidSourcesJar
// //archives androidJavadocsJar
//}
67 changes: 56 additions & 11 deletions tileview/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'
plugins {
id 'com.android.library'
id 'maven-publish'
}

android {
compileSdkVersion 23
buildToolsVersion "21.1.2"
compileSdk 34
defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode 40
versionName "2.2.9"
minSdkVersion 21
targetSdkVersion 34
}
buildTypes {
release {
Expand All @@ -21,9 +21,54 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.2.1'
testImplementation 'junit:junit:4.12'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:23.2.1'
}

apply from: 'aar-release.gradle'
afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release

groupId = 'com.github.smartapps-fr'
artifactId = 'tileview'
version = '1.0.0'

pom {
packaging 'aar'
groupId 'com.github.smartapps-fr'
artifactId 'tileview'

// Add your description here
name = 'tileview'
description = 'TileView fork to maintain Smartapps libraries'
url = 'https://smartapps.fr/'

// Set your license
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id = 'smartapps'
name = 'Smartapps'
email = '[email protected]'
}
}
scm {
connection = 'https://github.com/smartapps-fr/tileview.git'
developerConnection = 'https://github.com/smartapps-fr/tileview.git'
tag = '1.0.0'
url = 'https://github.com/smartapps-fr/tileview.git'

}
}
}
}
}
}

0 comments on commit 2aa3fab

Please sign in to comment.