Skip to content

Commit 1fbc418

Browse files
committed
deprecated methods removed.
1 parent 096aabe commit 1fbc418

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
buildscript {
33
ext {
44
agp_version = '8.1.1'
5-
kotlin_version = '1.9.0'
6-
material_version = '1.9.0'
5+
kotlin_version = '1.9.10'
6+
material_design_version = '1.9.0'
77
appcompat_version = '1.6.1'
88
annotation_version = '1.6.0'
99
fragment_version = '1.6.1'
10-
nav_version = '2.7.1'
10+
nav_version = '2.7.2'
1111
room_version = '2.5.2'
1212
flexbox_version = '3.0.0'
1313
splash_version = '1.0.1'
@@ -39,8 +39,8 @@ plugins {
3939
/** Version Settings, loaded from file `version.properties` */
4040
def version = new Properties()
4141
version.load(new FileInputStream(rootProject.file('version.properties')))
42-
project.ext.set('version_code', new Integer(version['versionCode']))
43-
project.ext.set('version_name', version['versionName'])
42+
project.ext.set('versionCode', new Integer(version['versionCode']))
43+
project.ext.set('versionName', version['versionName'])
4444

4545
/* JitPack: use tag as versionName. */
4646
if (System.env.JITPACK) {

library/build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ plugins {
33
id 'maven-publish'
44
}
55

6+
base {
7+
archivesName = 'androidx_github_' + rootProject.ext.get('versionName')
8+
}
9+
610
android {
711
namespace 'io.syslogic.github.api'
812
buildToolsVersion = '34.0.0'
913
compileSdk 34
1014
defaultConfig {
1115
minSdk 22
1216
targetSdk 34
13-
setProperty("archivesBaseName", "androidx_github_$version_name")
1417
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1518
consumerProguardFile "${project.rootDir}/proguard/consumer.pro"
1619
javaCompileOptions {
@@ -61,12 +64,12 @@ android {
6164

6265
dependencies {
6366

67+
// Material Design Components
68+
implementation "com.google.android.material:material:$material_design_version"
69+
6470
// Annotations
6571
implementation "androidx.annotation:annotation:$annotation_version"
6672

67-
// Material Design Components
68-
implementation "com.google.android.material:material:$material_version"
69-
7073
// App Compat
7174
implementation "androidx.appcompat:appcompat:$appcompat_version"
7275

@@ -85,8 +88,8 @@ dependencies {
8588
exclude group: "com.google.code.gson", module: "gson"
8689
}
8790

88-
testImplementation 'junit:junit:4.13.2'
89-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
91+
testImplementation "junit:junit:$junit_version"
92+
androidTestImplementation "androidx.test.ext:junit:$test_junit_version"
9093
}
9194

9295
tasks.register('javadoc', Javadoc) {
@@ -157,15 +160,15 @@ artifacts {
157160
}
158161

159162
group = 'io.syslogic'
160-
version = rootProject.ext.get('version_name')
163+
version = rootProject.ext.get('versionName')
161164

162165
afterEvaluate {
163166
publishing {
164167
publications {
165168
release(MavenPublication) {
166169
groupId = group
167170
artifactId = 'androidx-github'
168-
version = rootProject.ext.get('version_name')
171+
version = rootProject.ext.get('versionName')
169172
from components.getByName('release')
170173
pom {
171174
name = 'GitHub API Client'

mobile/build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ plugins {
44
id "androidx.navigation.safeargs"
55
}
66

7+
base {
8+
archivesName = 'github_client_' + rootProject.ext.get('versionName')
9+
}
10+
711
android {
812
namespace 'io.syslogic.github'
913
buildToolsVersion = '34.0.0'
@@ -13,9 +17,8 @@ android {
1317
targetSdk 34
1418
applicationId 'io.syslogic.github'
1519
manifestPlaceholders = [ accessToken: "" ]
16-
versionName rootProject.ext.get('version_name')
17-
versionCode rootProject.ext.get('version_code')
18-
setProperty("archivesBaseName", "github_client_$version_name")
20+
versionName rootProject.ext.get('versionName')
21+
versionCode rootProject.ext.get('versionCode')
1922
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2023
testBuildType "debug"
2124
multiDexEnabled true
@@ -105,12 +108,12 @@ dependencies {
105108

106109
api project(path: ':library')
107110

111+
// Material Design Components
112+
implementation "com.google.android.material:material:$material_design_version"
113+
108114
// Annotations
109115
implementation "androidx.annotation:annotation:$annotation_version"
110116

111-
// Material Design Components
112-
implementation "com.google.android.material:material:$material_version"
113-
114117
// Flexbox Layout
115118
implementation "com.google.android.flexbox:flexbox:$flexbox_version"
116119

0 commit comments

Comments
 (0)