Update dependencies

app/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "at.allaboutapps.gdprpolicysdk"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 33
 
         versionCode 1
         versionName "1.0"
@@ -34,16 +34,16 @@ android {
 dependencies {
     implementation project(':library')
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 
-    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
-    implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
+    implementation 'com.google.firebase:firebase-analytics-ktx:21.1.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.12'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }

app/src/main/AndroidManifest.xml

@@ -30,7 +30,8 @@
             android:value="false" />
 
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

build.gradle

@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.7.10'
 
     repositories {
         google()
-        jcenter()
+        maven { url 'https://jitpack.io' }
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:7.3.0-rc01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
 
@@ -22,7 +22,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle

@@ -1,7 +1,3 @@
-plugins {
-    id "com.jfrog.bintray" version "1.7.3"
-    id "com.github.dcendents.android-maven" version "2.1"
-}
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'org.jetbrains.dokka'
@@ -10,11 +6,11 @@ group = 'at.allaboutapps.gdpr'
 version = '1.0.0-alpha2'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 33
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -39,42 +35,20 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
-    def lifecycle_version = "2.2.0"
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    def lifecycle_version = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
 
-    implementation "at.allaboutapps.web:a3webview:0.1.1"
+    implementation "com.github.allaboutapps:A3WebView:V0.1.2"
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
-bintray {
-    user = 'allaboutapps'
-    // read pw from secure travis.yml
-    key = System.getenv('BINTRAY_KEY')
-    pkg {
-        repo = 'A3-Android'
-        name = "$project.group.$archivesBaseName"
-
-        version {
-            name = project.version
-            desc = ''
-            vcsTag = System.getenv('TRAVIS_TAG')
-        }
-
-        licenses = ['MIT']
-        vcsUrl = 'https://github.com/allaboutapps/gdpr-android'
-        websiteUrl = 'http://www.allaboutapps.at'
-    }
-    configurations = ['archives']
-}
-
 task javadoc(type: Javadoc) {
     excludes = ['**/*.kt'] // Exclude all kotlin files from javadoc file.
 }

library/src/main/java/at/allaboutapps/gdpr/GDPRActivity.kt

@@ -88,7 +88,7 @@ class GDPRActivity : AppCompatActivity() {
         val buttonConfirm = findViewById<Button>(R.id.action_submit)
 
         val factory = ViewModelFactory(servicesResId, this)
-        val viewModel = ViewModelProvider(this, factory).get(SettingsViewModel::class.java)
+        val viewModel = ViewModelProvider(this, factory)[SettingsViewModel::class.java]
 
         if (requireToS) {
             buttonConfirm.isEnabled = (viewModel.tosAccepted.value ?: false)

library/src/main/java/at/allaboutapps/gdpr/ViewModelFactory.kt

@@ -9,7 +9,7 @@ internal class ViewModelFactory(
     private val servicesResId: Int,
     private val context: Context
 ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         val parser = ServicesPullParser(
             context,
             servicesResId

library/src/main/java/at/allaboutapps/gdpr/policy/UrlPolicyLoadingMethod.kt

@@ -20,7 +20,7 @@ internal class UrlPolicyLoadingMethod : PolicyLoadingMethod, Parcelable {
     }
 
     override fun startLoading(webView: WebView) {
-        webView.loadUrl(mUrl)
+        webView.loadUrl(mUrl.toString())
     }
 
     override fun describeContents(): Int {