UUI-498

- revert AGP upgrade - revert kotlin upgrade
schibsted · Apr 19, 2024 · 4fe27e3 · 4fe27e3
1 parent 28a0cbc
commit 4fe27e3
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 29 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,7 +35,6 @@ android {
     buildFeatures {
         viewBinding = true
     }
-    namespace 'com.schibsted.account'
 }
 
 sourceSets {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.schibsted.account">
 
     <application
         android:name=".example.ExampleApp"
@@ -11,42 +12,48 @@
 
         <activity
             android:name="com.schibsted.account.example.MainActivity"
-            android:label="@string/app_name"
-            android:exported="true">
+            android:exported="true"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.schibsted.account.example.LoggedInActivity"
-            android:label="Logged-in"/>
+            android:label="Logged-in" />
 
         <activity
             android:name="com.schibsted.account.webflows.activities.RedirectUriReceiverActivity"
-            android:label="Automatic login"
-            android:exported="true">
+            android:exported="true"
+            android:label="Automatic login">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="com.sdk-example.pre.602525f2b41fa31789a95aa8"
+
+                <data
                     android:host="*"
-                    android:path="/login"/>
+                    android:path="/login"
+                    android:scheme="com.sdk-example.pre.602525f2b41fa31789a95aa8" />
             </intent-filter>
         </activity>
 
         <activity
             android:name="com.schibsted.account.example.ManualLoginActivity"
-            android:label="Manual login"
-            android:exported="true">
+            android:exported="true"
+            android:label="Manual login">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="com.sdk-example.pre.602525f2b41fa31789a95aa8"
+
+                <data
                     android:host="*"
-                    android:path="/manual-login"/>
+                    android:path="/manual-login"
+                    android:scheme="com.sdk-example.pre.602525f2b41fa31789a95aa8" />
             </intent-filter>
         </activity>
     </application>

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '1.6.20'
     ext.timber_version = '5.0.1'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,7 +16,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.android" version '1.9.10' apply false
+    id "org.jetbrains.kotlin.android" version '1.4.21' apply false
     id("org.jetbrains.dokka") version "1.6.10"
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
 }

diff --git a/testsupport/build.gradle b/testsupport/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 30
     }
 
     compileOptions {
@@ -19,7 +19,6 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'com.schibsted.account.webflows.testsupport'
 }
 
 dependencies {

diff --git a/testsupport/src/main/AndroidManifest.xml b/testsupport/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.schibsted.account.webflows.testsupport">
 
     <application>
         <activity android:name=".TestActivity" />

diff --git a/webflows/src/main/AndroidManifest.xml b/webflows/src/main/AndroidManifest.xml
@@ -1,17 +1,19 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.schibsted.account.webflows">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
         <provider
-          android:name="com.schibsted.account.webflows.loginPrompt.LoginPromptContentProvider"
-          android:authorities="${applicationId}.contentprovider"
-          android:enabled="true"
-          android:exported="true">
-          <intent-filter>
-            <action android:name="com.schibsted.account.LOGIN_PROMPT_CONTENT_PROVIDER" />
-          </intent-filter>
+            android:name="com.schibsted.account.webflows.loginPrompt.LoginPromptContentProvider"
+            android:authorities="${applicationId}.contentprovider"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.schibsted.account.LOGIN_PROMPT_CONTENT_PROVIDER" />
+            </intent-filter>
         </provider>
+
         <activity
             android:name="com.schibsted.account.webflows.activities.AuthorizationManagementActivity"
             android:exported="false"
@@ -24,7 +26,7 @@
             <action android:name="android.support.customtabs.action.CustomTabsService" />
         </intent>
         <intent>
-          <action android:name="com.schibsted.account.LOGIN_PROMPT_CONTENT_PROVIDER" />
+            <action android:name="com.schibsted.account.LOGIN_PROMPT_CONTENT_PROVIDER" />
         </intent>
     </queries>
 </manifest>