update all dependencies in library

cutExecute · cutExecute · commit a4cc74dac43c · 2024-04-21T21:43:23.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion versions.targetSdk
         versionCode 1
         versionName "1.0"
-        resConfigs "en", "ru"
+        resourceConfigurations += ['en', 'ru']
     }
     buildTypes {
         release {
@@ -18,6 +18,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'work.upstarts'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="work.upstarts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/app/src/main/java/work/upstarts/MainActivity.kt b/app/src/main/java/work/upstarts/MainActivity.kt
@@ -15,6 +15,7 @@ import work.upstarts.editorjskit.models.HeadingLevel
 import work.upstarts.editorjskit.ui.EditorJsAdapter
 import work.upstarts.editorjskit.ui.theme.EJStyle
 import work.upstarts.gsonparser.EJDeserializer
+import work.upstarts.editorjskit.R as EditorJsR
 
 const val DATA_JSON_PATH = "dummy_data.json"
 
@@ -25,8 +26,8 @@ class MainActivity : AppCompatActivity() {
     private val rvAdapter: EditorJsAdapter by lazy {
         EditorJsAdapter(
             EJStyle.builderWithDefaults(applicationContext)
-                .linkColor(ContextCompat.getColor(this, R.color.link_color))
-                .linkColor(ContextCompat.getColor(this, R.color.link_color))
+                .linkColor(ContextCompat.getColor(this, EditorJsR.color.link_color))
+                .linkColor(ContextCompat.getColor(this, EditorJsR.color.link_color))
                 .headingMargin(
                     ZERO_MARGIN,
                     ZERO_MARGIN,
@@ -41,7 +42,7 @@ class MainActivity : AppCompatActivity() {
                     ZERO_MARGIN,
                     HeadingLevel.h2
                 )
-                .linkColor(ContextCompat.getColor(this, R.color.link_color))
+                .linkColor(ContextCompat.getColor(this, EditorJsR.color.link_color))
                 .dividerBreakHeight(DIVIDER_HEIGHT.dp)
                 .dividerMargin(0.dp, 4.dp, 0.dp, 4.dp)
                 .dividerBreakColor(Color.parseColor("#32000000"))
diff --git a/build.gradle b/build.gradle
@@ -7,15 +7,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 plugins {
     // плагин для автоматизации публикации нашей либы
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
 }
 allprojects {
     repositories {
diff --git a/editorjskit/build.gradle b/editorjskit/build.gradle
@@ -16,8 +16,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -27,10 +25,19 @@ android {
             minifyEnabled false
         }
     }
-
-    lintOptions {
+    namespace 'work.upstarts.editorjskit'
+    lint {
         warning 'InvalidPackage'
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
 }
 
 dependencies {
diff --git a/editorjskit/src/main/AndroidManifest.xml b/editorjskit/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="work.upstarts.editorjskit"/>
+<manifest />
diff --git a/editorjskit/src/main/java/work/upstarts/editorjskit/models/data/EJListData.kt b/editorjskit/src/main/java/work/upstarts/editorjskit/models/data/EJListData.kt
@@ -12,7 +12,7 @@ enum class ListType(private val jsonName: String) {
     override fun toString() = jsonName
 
     companion object {
-        fun fromStyle(style: String) = values().first { it.jsonName == style }
+        fun fromStyle(style: String) = entries.first { it.jsonName == style }
     }
 
 }
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -1,17 +1,16 @@
 ext.versions = [
-        compileSdk           : 31,
-        targetSdk            : 31,
+        compileSdk           : 34,
+        targetSdk            : 34,
         minSdk               : 21,
-        kotlin               : '1.6.21',
-        androidx_appcompat   : '1.4.1',
+        kotlin               : '1.9.22',
+        androidx_appcompat   : '1.6.1',
         androidx_constraint  : '2.1.4',
-        androidx_recyclerview: '1.2.1',
-        androidx_core_ktx    : '1.7.0',
+        androidx_recyclerview: '1.3.2',
+        androidx_core_ktx    : '1.13.0',
         junit                : '4.13.2',
-        gson                 : '2.9.0',
-        moshi                : '1.13.0',
+        gson                 : '2.10.1',
+        moshi                : '1.15.1',
         adapter_delegates    : '4.3.2',
-        glide                : '4.13.2',
-        novoda_bintray_plugin: '1.0.0',
-        publishVersion       : '2.0.0'
+        glide                : '4.16.0',
+        publishVersion       : '2.0.1'
 ]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Apr 07 13:57:06 MSK 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gsonparser/build.gradle b/gsonparser/build.gradle
@@ -17,8 +17,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -28,10 +26,18 @@ android {
             minifyEnabled false
         }
     }
-
-    lintOptions {
+    namespace 'work.upstarts.gsonparser'
+    lint {
         warning 'InvalidPackage'
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
 }
 
 dependencies {
diff --git a/gsonparser/src/main/AndroidManifest.xml b/gsonparser/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="work.upstarts.gsonparser" />
+<manifest />
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
diff --git a/moshiparser/build.gradle b/moshiparser/build.gradle
@@ -17,8 +17,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 1
-        versionName "1.0"
 
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -28,6 +26,14 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'work.upstarts.moshiparser'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {
diff --git a/moshiparser/src/main/AndroidManifest.xml b/moshiparser/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="work.upstarts.moshiparser" />
+<manifest />

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ android {`
`9`	`9`	`targetSdkVersion versions.targetSdk`
`10`	`10`	`versionCode 1`
`11`	`11`	`versionName "1.0"`
`12`		`- resConfigs "en", "ru"`
	`12`	`+ resourceConfigurations += ['en', 'ru']`
`13`	`13`	`}`
`14`	`14`	`buildTypes {`
`15`	`15`	`release {`
`@@ -18,6 +18,14 @@ android {`
`18`	`18`	`proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'`
`19`	`19`	`}`
`20`	`20`	`}`
	`21`	`+ namespace 'work.upstarts'`
	`22`	`+ compileOptions {`
	`23`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`24`	`+ targetCompatibility = JavaVersion.VERSION_17`
	`25`	`+ }`
	`26`	`+ kotlinOptions {`
	`27`	`+ jvmTarget = "17"`
	`28`	`+ }`
`21`	`29`	`}`
`22`	`30`
`23`	`31`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:7.0.4'`
	`10`	`+ classpath 'com.android.tools.build:gradle:8.3.2'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`plugins {`
`17`	`17`	`// плагин для автоматизации публикации нашей либы`
`18`		`- id "io.github.gradle-nexus.publish-plugin" version "1.1.0"`
	`18`	`+ id "io.github.gradle-nexus.publish-plugin" version "2.0.0"`
`19`	`19`	`}`
`20`	`20`	`allprojects {`
`21`	`21`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ android {`
`16`	`16`	`defaultConfig {`
`17`	`17`	`minSdkVersion versions.minSdk`
`18`	`18`	`targetSdkVersion versions.targetSdk`
`19`		`- versionCode 1`
`20`		`- versionName "1.0"`
`21`	`19`
`22`	`20`	`consumerProguardFiles 'consumer-rules.pro'`
`23`	`21`	`}`
`@@ -27,10 +25,19 @@ android {`
`27`	`25`	`minifyEnabled false`
`28`	`26`	`}`
`29`	`27`	`}`
`30`		`-`
`31`		`- lintOptions {`
	`28`	`+ namespace 'work.upstarts.editorjskit'`
	`29`	`+ lint {`
`32`	`30`	`warning 'InvalidPackage'`
`33`	`31`	`}`
	`32`	`+`
	`33`	`+ compileOptions {`
	`34`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`35`	`+ targetCompatibility = JavaVersion.VERSION_17`
	`36`	`+ }`
	`37`	`+ kotlinOptions {`
	`38`	`+ jvmTarget = "17"`
	`39`	`+ }`
	`40`	`+`
`34`	`41`	`}`
`35`	`42`
`36`	`43`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<manifest package="work.upstarts.editorjskit"/>`
	`1`	`+<manifest />`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ enum class ListType(private val jsonName: String) {`
`12`	`12`	`override fun toString() = jsonName`
`13`	`13`
`14`	`14`	`companion object {`
`15`		`- fun fromStyle(style: String) = values().first { it.jsonName == style }`
	`15`	`+ fun fromStyle(style: String) = entries.first { it.jsonName == style }`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ android {`
`17`	`17`	`defaultConfig {`
`18`	`18`	`minSdkVersion versions.minSdk`
`19`	`19`	`targetSdkVersion versions.targetSdk`
`20`		`- versionCode 1`
`21`		`- versionName "1.0"`
`22`	`20`
`23`	`21`	`consumerProguardFiles 'consumer-rules.pro'`
`24`	`22`	`}`
`@@ -28,10 +26,18 @@ android {`
`28`	`26`	`minifyEnabled false`
`29`	`27`	`}`
`30`	`28`	`}`
`31`		`-`
`32`		`- lintOptions {`
	`29`	`+ namespace 'work.upstarts.gsonparser'`
	`30`	`+ lint {`
`33`	`31`	`warning 'InvalidPackage'`
`34`	`32`	`}`
	`33`	`+ compileOptions {`
	`34`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`35`	`+ targetCompatibility = JavaVersion.VERSION_17`
	`36`	`+ }`
	`37`	`+ kotlinOptions {`
	`38`	`+ jvmTarget = "17"`
	`39`	`+ }`
	`40`	`+`
`35`	`41`	`}`
`36`	`42`
`37`	`43`	`dependencies {`