deprecated methods removed.

syslogic · Sep 8, 2023 · 1fbc418 · 1fbc418
1 parent 096aabe
commit 1fbc418
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,12 +2,12 @@
 buildscript {
     ext {
         agp_version = '8.1.1'
-        kotlin_version = '1.9.0'
-        material_version = '1.9.0'
+        kotlin_version = '1.9.10'
+        material_design_version = '1.9.0'
         appcompat_version = '1.6.1'
         annotation_version = '1.6.0'
         fragment_version = '1.6.1'
-        nav_version = '2.7.1'
+        nav_version = '2.7.2'
         room_version = '2.5.2'
         flexbox_version = '3.0.0'
         splash_version = '1.0.1'
@@ -39,8 +39,8 @@ plugins {
 /** Version Settings, loaded from file `version.properties` */
 def version = new Properties()
 version.load(new FileInputStream(rootProject.file('version.properties')))
-project.ext.set('version_code', new Integer(version['versionCode']))
-project.ext.set('version_name', version['versionName'])
+project.ext.set('versionCode', new Integer(version['versionCode']))
+project.ext.set('versionName', version['versionName'])
 
 /* JitPack: use tag as versionName. */
 if (System.env.JITPACK) {

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,14 +3,17 @@ plugins {
     id 'maven-publish'
 }
 
+base {
+    archivesName = 'androidx_github_' + rootProject.ext.get('versionName')
+}
+
 android {
     namespace 'io.syslogic.github.api'
     buildToolsVersion = '34.0.0'
     compileSdk 34
     defaultConfig {
         minSdk 22
         targetSdk 34
-        setProperty("archivesBaseName", "androidx_github_$version_name")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFile "${project.rootDir}/proguard/consumer.pro"
         javaCompileOptions {
@@ -61,12 +64,12 @@ android {
 
 dependencies {
 
+    // Material Design Components
+    implementation "com.google.android.material:material:$material_design_version"
+
     // Annotations
     implementation "androidx.annotation:annotation:$annotation_version"
 
-    // Material Design Components
-    implementation "com.google.android.material:material:$material_version"
-
     // App Compat
     implementation "androidx.appcompat:appcompat:$appcompat_version"
 
@@ -85,8 +88,8 @@ dependencies {
         exclude group: "com.google.code.gson", module: "gson"
     }
 
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$test_junit_version"
 }
 
 tasks.register('javadoc', Javadoc) {
@@ -157,15 +160,15 @@ artifacts {
 }
 
 group = 'io.syslogic'
-version = rootProject.ext.get('version_name')
+version = rootProject.ext.get('versionName')
 
 afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
                 groupId = group
                 artifactId = 'androidx-github'
-                version = rootProject.ext.get('version_name')
+                version = rootProject.ext.get('versionName')
                 from components.getByName('release')
                 pom {
                     name = 'GitHub API Client'

diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -4,6 +4,10 @@ plugins {
     id "androidx.navigation.safeargs"
 }
 
+base {
+    archivesName = 'github_client_' + rootProject.ext.get('versionName')
+}
+
 android {
     namespace 'io.syslogic.github'
     buildToolsVersion = '34.0.0'
@@ -13,9 +17,8 @@ android {
         targetSdk 34
         applicationId 'io.syslogic.github'
         manifestPlaceholders = [ accessToken: "" ]
-        versionName rootProject.ext.get('version_name')
-        versionCode rootProject.ext.get('version_code')
-        setProperty("archivesBaseName", "github_client_$version_name")
+        versionName rootProject.ext.get('versionName')
+        versionCode rootProject.ext.get('versionCode')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testBuildType "debug"
         multiDexEnabled true
@@ -105,12 +108,12 @@ dependencies {
 
     api project(path: ':library')
 
+    // Material Design Components
+    implementation "com.google.android.material:material:$material_design_version"
+
     // Annotations
     implementation "androidx.annotation:annotation:$annotation_version"
 
-    // Material Design Components
-    implementation "com.google.android.material:material:$material_version"
-
     // Flexbox Layout
     implementation "com.google.android.flexbox:flexbox:$flexbox_version"