update dependencies

Author: Ruslan Aliev

app/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -21,4 +22,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

build.gradle

@@ -4,11 +4,10 @@ buildscript {
     apply from: rootProject.file('gradle/versions.gradle')
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         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
@@ -17,9 +16,8 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
         google()
-        jcenter()
+        mavenCentral()
 
     }
 }

editorjskit/build.gradle

@@ -1,14 +1,12 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.panpf.bintray-publish'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 buildscript {
     repositories {
-        mavenLocal()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.github.panpf.bintray-publish:bintray-publish:${versions.novoda_bintray_plugin}"
     }
 }
 
@@ -33,16 +31,6 @@ android {
     lintOptions {
         warning 'InvalidPackage'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
 }
 
 dependencies {
@@ -55,8 +43,15 @@ dependencies {
     testImplementation "junit:junit:${versions.junit}"
 }
 
-apply from: rootProject.file("gradle/publish.gradle")
-publish {
-    repoName = 'EditorJSKit'
-    artifactId = 'ejkit'
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifactId "ejkit"
+                groupId "work.upstarts.editorjskit"
+                version "${versions.publishVersion}"
+            }
+        }
+    }
 }

editorjskit/src/main/java/work/upstarts/editorjskit/environment/Extensions.kt

@@ -42,10 +42,7 @@ fun ImageView.loadImage(url: String?, data: EJImageData) {
 }
 
 val Int.dp: Int
-    get() = (this * Resources.getSystem().displayMetrics.density + 0.5f).toInt()
-
-val Int.sp: Int
-    get() = (this * Resources.getSystem().displayMetrics.density + 0.5f).toInt()
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
 
 fun Spannable.applyThemeForUrlSpans(theme: EJStyle?, context: Context) {
     for (u in getSpans(0, length, URLSpan::class.java)) {

gradle/versions.gradle

@@ -1,16 +1,17 @@
 ext.versions = [
-        compileSdk           : 29,
-        targetSdk            : 29,
+        compileSdk           : 31,
+        targetSdk            : 31,
         minSdk               : 21,
-        kotlin               : '1.4.32',
-        androidx_appcompat   : '1.2.0',
-        androidx_constraint  : '2.0.4',
-        androidx_recyclerview: '1.1.0',
-        androidx_core_ktx    : '1.3.2',
+        kotlin               : '1.6.21',
+        androidx_appcompat   : '1.4.1',
+        androidx_constraint  : '2.1.4',
+        androidx_recyclerview: '1.2.1',
+        androidx_core_ktx    : '1.7.0',
         junit                : '4.13.2',
-        gson                 : '2.8.6',
-        adapter_delegates    : '4.3.0',
-        glide                : '4.12.0',
+        gson                 : '2.9.0',
+        moshi                : '1.13.0',
+        adapter_delegates    : '4.3.2',
+        glide                : '4.13.2',
         novoda_bintray_plugin: '1.0.0',
         publishVersion       : '2.0.0'
 ]

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-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gsonparser/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.panpf.bintray-publish'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
+
 
 buildscript {
     repositories {
-        mavenLocal()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.github.panpf.bintray-publish:bintray-publish:${versions.novoda_bintray_plugin}"
     }
 }
 
@@ -33,26 +32,22 @@ android {
     lintOptions {
         warning 'InvalidPackage'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
 }
 
 dependencies {
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
     api "com.google.code.gson:gson:${versions.gson}"
     api project(":editorjskit")
 }
 
-apply from: rootProject.file("gradle/publish.gradle")
-publish {
-    repoName = 'EditorJSKit-Gson'
-    artifactId = 'ejkit-gson'
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifactId "ejkit-gson"
+                groupId "work.upstarts.editorjskit"
+                version "${versions.publishVersion}"
+            }
+        }
+    }
 }

moshiparser/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.panpf.bintray-publish'
 apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
+
 
 buildscript {
     repositories {
-        mavenLocal()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.github.panpf.bintray-publish:bintray-publish:${versions.novoda_bintray_plugin}"
     }
 }
 
@@ -29,29 +28,27 @@ android {
             minifyEnabled false
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
-
     //Moshi
-    implementation("com.squareup.moshi:moshi-kotlin:1.11.0")
-    implementation "com.squareup.moshi:moshi-adapters:1.11.0"
+    implementation "com.squareup.moshi:moshi-kotlin:${versions.moshi}"
+    implementation "com.squareup.moshi:moshi-adapters:${versions.moshi}"
 
     api project(":editorjskit")
     testImplementation 'junit:junit:4.13.2'
 }
 
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
 
-apply from: rootProject.file("gradle/publish.gradle")
-publish {
-    repoName = 'EditorJSKit-Moshi'
-    artifactId = 'ejkit-moshi'
-}
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                artifactId "ejkit-moshi"
+                groupId "work.upstarts.editorjskit"
+                version "${versions.publishVersion}"
+            }
+        }
+    }
+}