Skip to content

Commit 6e0d627

Browse files
author
Adil Hussain
committed
Upgraded build tools and libraries to their latest versions.
1 parent ce53f16 commit 6e0d627

File tree

5 files changed

+32
-26
lines changed

5 files changed

+32
-26
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
junit5_version = '5.9.1'
4-
kotlin_version = '1.7.20'
3+
junit5_version = '5.9.3'
4+
kotlin_version = '1.8.20'
55
}
66

77
repositories {
@@ -10,13 +10,13 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.3.1'
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13+
classpath 'com.android.tools.build:gradle:8.0.2'
1514
}
1615
}
1716

1817
plugins {
19-
id("org.jetbrains.dokka") version "$kotlin_version"
18+
id 'org.jetbrains.dokka' version "$kotlin_version" apply false
19+
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
2020
}
2121

2222
allprojects {
@@ -27,5 +27,5 @@ allprojects {
2727
}
2828

2929
wrapper {
30-
gradleVersion = '7.6'
30+
gradleVersion = '8.2.1'
3131
}

gradle/wrapper/gradle-wrapper.jar

1.76 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -133,26 +130,29 @@ location of your Java installation."
133130
fi
134131
else
135132
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137136
138137
Please set the JAVA_HOME variable in your environment to match the
139138
location of your Java installation."
139+
fi
140140
fi
141141

142142
# Increase the maximum file descriptors if we can.
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
147+
# shellcheck disable=SC3045
148148
MAX_FD=$( ulimit -H -n ) ||
149149
warn "Could not query maximum file descriptor limit"
150150
esac
151151
case $MAX_FD in #(
152152
'' | soft) :;; #(
153153
*)
154154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
155+
# shellcheck disable=SC3045
156156
ulimit -n "$MAX_FD" ||
157157
warn "Could not set maximum file descriptor limit to $MAX_FD"
158158
esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
197197
done
198198
fi
199199

200+
201+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203+
200204
# Collect all arguments for the java command;
201205
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202206
# shell script including quotes and variable substitutions, so put them in

library/build.gradle

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
32
apply plugin: 'maven-publish'
43
apply plugin: 'org.jetbrains.dokka'
4+
apply plugin: 'org.jetbrains.kotlin.android'
55
apply plugin: 'signing'
66

77
group = getProperty('projectGroupName')
@@ -11,12 +11,12 @@ File[] proGuardFileCollection = file('./proguard').listFiles()
1111
File[] proGuardDebugFileCollection = file('./proguard-debug').listFiles()
1212

1313
android {
14-
compileSdkVersion 31
14+
compileSdkVersion 33
1515
namespace 'com.tazkiyatech.utils'
1616

1717
defaultConfig {
1818
minSdkVersion 19
19-
targetSdkVersion 31
19+
targetSdkVersion 33
2020
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2121
}
2222

@@ -38,12 +38,12 @@ android {
3838
}
3939

4040
compileOptions {
41-
sourceCompatibility JavaVersion.VERSION_1_8
42-
targetCompatibility JavaVersion.VERSION_1_8
41+
sourceCompatibility JavaVersion.VERSION_11
42+
targetCompatibility JavaVersion.VERSION_11
4343
}
4444

4545
kotlinOptions {
46-
jvmTarget = JavaVersion.VERSION_1_8
46+
jvmTarget = JavaVersion.VERSION_11
4747
}
4848

4949
lintOptions {
@@ -58,9 +58,9 @@ android {
5858
}
5959

6060
dependencies {
61-
api 'androidx.appcompat:appcompat:1.4.2'
62-
api 'androidx.recyclerview:recyclerview:1.2.1'
63-
implementation 'androidx.annotation:annotation:1.5.0'
61+
api 'androidx.appcompat:appcompat:1.6.1'
62+
api 'androidx.recyclerview:recyclerview:1.3.0'
63+
implementation 'androidx.annotation:annotation:1.6.0'
6464

6565
testImplementation 'org.hamcrest:hamcrest-core:2.2'
6666
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
@@ -75,12 +75,13 @@ dependencies {
7575
task generateSourcesJar(type: Jar) {
7676
from android.sourceSets.main.java.srcDirs
7777
archiveClassifier.set('sources')
78+
description = "Builds up a jar of this module's sources."
7879
group = 'build'
7980
}
8081

8182
task generateJavadocJar(type: Jar) {
8283
from dokkaJavadoc
83-
classifier 'javadoc'
84+
archiveClassifier.set("javadoc")
8485
description = "Builds up a jar of this module's Javadoc."
8586
group = 'build'
8687
}
@@ -91,7 +92,7 @@ afterEvaluate {
9192
release(MavenPublication) {
9293
from components.release
9394
artifact generateJavadocJar
94-
artifact generateSourcesJar
95+
// artifact generateSourcesJar
9596

9697
groupId getProperty('projectGroupName')
9798
artifactId getProperty('projectArtifactName')
@@ -128,7 +129,7 @@ afterEvaluate {
128129
debug(MavenPublication) {
129130
from components.debug
130131
artifact generateJavadocJar
131-
artifact generateSourcesJar
132+
// artifact generateSourcesJar
132133

133134
groupId getProperty('projectGroupName')
134135
artifactId getProperty('projectArtifactName')
@@ -151,4 +152,4 @@ afterEvaluate {
151152
// the 'signing.keyId', 'signing.password' and 'signing.secretKeyRingFile' properties required by this task are defined outside of this project in the '~/.gradle/gradle.properties' file
152153
sign publishing.publications.release
153154
}
154-
}
155+
}

0 commit comments

Comments
 (0)