Skip to content

Commit 2aa3fab

Browse files
author
Arnaud Caillet
committed
Update version
1 parent 3f3cc58 commit 2aa3fab

File tree

6 files changed

+137
-84
lines changed

6 files changed

+137
-84
lines changed

‎build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
maven {
7+
url 'https://maven.google.com/'
8+
name 'Google'
9+
}
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.1'
12+
classpath 'com.android.tools.build:gradle:7.4.2'
913

1014
// NOTE: Do not place your application dependencies here; they belong
1115
// in the individual module build.gradle files
@@ -15,6 +19,10 @@ buildscript {
1519
allprojects {
1620
repositories {
1721
jcenter()
22+
maven {
23+
url 'https://maven.google.com/'
24+
name 'Google'
25+
}
1826
}
1927
}
2028

‎demo/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 33
5+
buildToolsVersion "34.0.0"
66

77
defaultConfig {
88
applicationId "tileview.demo"
9-
minSdkVersion 11
10-
targetSdkVersion 23
9+
minSdkVersion 21
10+
targetSdkVersion 33
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -23,9 +23,9 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
testCompile 'junit:junit:4.12'
28-
compile 'com.android.support:appcompat-v7:23.2.1'
29-
compile 'com.squareup.picasso:picasso:2.5.2'
30-
compile project(':tileview')
26+
testImplementation 'junit:junit:4.12'
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
implementation project(':tileview')
29+
implementation 'com.android.support:appcompat-v7:26.1.0'
30+
implementation 'com.squareup.picasso:picasso:2.5.2'
3131
}

‎demo/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
android:label="@string/app_name"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme" >
12-
<activity android:name=".MainActivity" >
12+
<activity android:name=".MainActivity" android:exported="true">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN" />
1515

1616
<category android:name="android.intent.category.LAUNCHER" />
1717
</intent-filter>
1818
</activity>
19-
<activity android:name=".BuildingPlansTileViewActivity" />
20-
<activity android:name=".FictionalMapTileViewActivity" />
21-
<activity android:name=".LargeImageTileViewActivity" />
22-
<activity android:name=".RealMapTileViewActivity" />
23-
<activity android:name=".RealMapInternetTileViewActivity" />
19+
<activity android:name=".BuildingPlansTileViewActivity" android:exported="false"/>
20+
<activity android:name=".FictionalMapTileViewActivity" android:exported="false"/>
21+
<activity android:name=".LargeImageTileViewActivity" android:exported="false"/>
22+
<activity android:name=".RealMapTileViewActivity" android:exported="false"/>
23+
<activity android:name=".RealMapInternetTileViewActivity" android:exported="false"/>
2424
</application>
2525

2626
</manifest>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Oct 26 20:44:34 CDT 2016
1+
#Wed Oct 25 10:22:11 CEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎tileview/aar-release.gradle‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
// credit https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle
2-
// run ./gradlew clean build generateRelease
3-
4-
apply plugin: 'maven'
5-
6-
def groupId = 'com.qozix'
7-
def artifactId = 'tileview'
8-
def version = android.defaultConfig.versionName
9-
10-
def localReleaseDest = "${buildDir}/release/${version}"
11-
12-
task androidJavadocs(type: Javadoc) {
13-
source = android.sourceSets.main.java.srcDirs
14-
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
15-
classpath += files(ext.androidJar)
16-
}
17-
18-
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
19-
classifier = 'javadoc'
20-
from androidJavadocs.destinationDir
21-
}
22-
23-
task androidSourcesJar(type: Jar) {
24-
classifier = 'sources'
25-
from android.sourceSets.main.java.srcDirs
26-
}
27-
28-
uploadArchives {
29-
repositories.mavenDeployer {
30-
pom.groupId = groupId
31-
pom.artifactId = artifactId
32-
pom.version = version
33-
// Add other pom properties here if you want (developer details / licenses)
34-
repository(url: "file://${localReleaseDest}")
35-
}
36-
}
37-
38-
task zipRelease(type: Zip) {
39-
from localReleaseDest
40-
destinationDir buildDir
41-
archiveName "release-${version}.zip"
42-
}
43-
44-
task generateRelease << {
45-
println "Release ${version} can be found at ${localReleaseDest}/"
46-
println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
47-
}
48-
49-
generateRelease.dependsOn(uploadArchives)
50-
generateRelease.dependsOn(zipRelease)
51-
52-
artifacts {
53-
archives androidSourcesJar
54-
//archives androidJavadocsJar
55-
}
1+
//// credit https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle
2+
//// run ./gradlew clean build generateRelease
3+
//
4+
//apply plugin: 'maven-publish'
5+
//
6+
//def groupId = 'com.qozix'
7+
//def artifactId = 'tileview'
8+
//def version = android.defaultConfig.versionName
9+
//
10+
//def localReleaseDest = "${buildDir}/release/${version}"
11+
//
12+
//task androidJavadocs(type: Javadoc) {
13+
// source = android.sourceSets.main.java.srcDirs
14+
// ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
15+
// classpath += files(ext.androidJar)
16+
//}
17+
//
18+
//task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
19+
// classifier = 'javadoc'
20+
// from androidJavadocs.destinationDir
21+
//}
22+
//
23+
//task androidSourcesJar(type: Jar) {
24+
// classifier = 'sources'
25+
// from android.sourceSets.main.java.srcDirs
26+
//}
27+
//
28+
////uploadArchives {
29+
//// repositories.mavenDeployer {
30+
//// pom.groupId = groupId
31+
//// pom.artifactId = artifactId
32+
//// pom.version = version
33+
//// // Add other pom properties here if you want (developer details / licenses)
34+
//// repository(url: "file://${localReleaseDest}")
35+
//// }
36+
////}
37+
//
38+
//task zipRelease(type: Zip) {
39+
// from localReleaseDest
40+
// destinationDir buildDir
41+
// archiveName "release-${version}.zip"
42+
//}
43+
//
44+
////task generateRelease << {
45+
//// println "Release ${version} can be found at ${localReleaseDest}/"
46+
//// println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
47+
////}
48+
//
49+
////generateRelease.dependsOn(uploadArchives)
50+
////generateRelease.dependsOn(zipRelease)
51+
//
52+
//artifacts {
53+
// archives androidSourcesJar
54+
// //archives androidJavadocsJar
55+
//}

‎tileview/build.gradle‎

Lines changed: 56 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
apply plugin: 'com.android.library'
1+
plugins {
2+
id 'com.android.library'
3+
id 'maven-publish'
4+
}
25

36
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "21.1.2"
7+
compileSdk 34
68
defaultConfig {
7-
minSdkVersion 11
8-
targetSdkVersion 23
9-
versionCode 40
10-
versionName "2.2.9"
9+
minSdkVersion 21
10+
targetSdkVersion 34
1111
}
1212
buildTypes {
1313
release {
@@ -21,9 +21,54 @@ android {
2121
}
2222

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

29-
apply from: 'aar-release.gradle'
29+
afterEvaluate {
30+
publishing {
31+
publications {
32+
release(MavenPublication) {
33+
from components.release
34+
35+
groupId = 'com.github.smartapps-fr'
36+
artifactId = 'tileview'
37+
version = '1.0.0'
38+
39+
pom {
40+
packaging 'aar'
41+
groupId 'com.github.smartapps-fr'
42+
artifactId 'tileview'
43+
44+
// Add your description here
45+
name = 'tileview'
46+
description = 'TileView fork to maintain Smartapps libraries'
47+
url = 'https://smartapps.fr/'
48+
49+
// Set your license
50+
licenses {
51+
license {
52+
name = 'The Apache Software License, Version 2.0'
53+
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
54+
}
55+
}
56+
developers {
57+
developer {
58+
id = 'smartapps'
59+
name = 'Smartapps'
60+
email = 'dd@smartapps.fr'
61+
}
62+
}
63+
scm {
64+
connection = 'https://github.com/smartapps-fr/tileview.git'
65+
developerConnection = 'https://github.com/smartapps-fr/tileview.git'
66+
tag = '1.0.0'
67+
url = 'https://github.com/smartapps-fr/tileview.git'
68+
69+
}
70+
}
71+
}
72+
}
73+
}
74+
}

0 commit comments

Comments
 (0)