Panagiotis Triantafyllou

REVERT: new gradle, fixes for new gradle

...@@ -3,7 +3,6 @@ apply plugin: 'com.android.application' ...@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
3 //apply plugin: 'com.huawei.agconnect' 3 //apply plugin: 'com.huawei.agconnect'
4 4
5 android { 5 android {
6 - namespace "warp.ly.android_sdk"
7 compileSdkVersion 34 6 compileSdkVersion 34
8 buildToolsVersion "34.0.0" 7 buildToolsVersion "34.0.0"
9 8
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<manifest xmlns:android="http://schemas.android.com/apk/res/android"> 2 +<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 + package="warp.ly.android_sdk">
3 4
4 <uses-permission android:name="android.permission.INTERNET" /> 5 <uses-permission android:name="android.permission.INTERNET" />
5 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 6 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
......
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
8 maven { url 'https://plugins.gradle.org/m2/' } 8 maven { url 'https://plugins.gradle.org/m2/' }
9 } 9 }
10 dependencies { 10 dependencies {
11 - classpath 'com.android.tools.build:gradle:8.1.4' 11 + classpath 'com.android.tools.build:gradle:7.1.3'
12 classpath 'com.google.gms:google-services:4.3.10' 12 classpath 'com.google.gms:google-services:4.3.10'
13 classpath 'com.huawei.agconnect:agcp:1.7.2.300' 13 classpath 'com.huawei.agconnect:agcp:1.7.2.300'
14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' 14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
......
1 #Fri Jul 26 17:08:44 EEST 2024 1 #Fri Jul 26 17:08:44 EEST 2024
2 distributionBase=GRADLE_USER_HOME 2 distributionBase=GRADLE_USER_HOME
3 distributionPath=wrapper/dists 3 distributionPath=wrapper/dists
4 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip 4 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
5 zipStoreBase=GRADLE_USER_HOME 5 zipStoreBase=GRADLE_USER_HOME
6 zipStorePath=wrapper/dists 6 zipStorePath=wrapper/dists
......
...@@ -32,7 +32,7 @@ afterEvaluate { ...@@ -32,7 +32,7 @@ afterEvaluate {
32 32
33 // Two artifacts, the `aar` (or `jar`) and the sources 33 // Two artifacts, the `aar` (or `jar`) and the sources
34 if (project.plugins.findPlugin("com.android.library")) { 34 if (project.plugins.findPlugin("com.android.library")) {
35 - from components.findByName('release') 35 + from components.release
36 } else { 36 } else {
37 from components.java 37 from components.java
38 } 38 }
......
...@@ -2,14 +2,13 @@ apply plugin: 'com.android.library' ...@@ -2,14 +2,13 @@ apply plugin: 'com.android.library'
2 2
3 ext { 3 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 4 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.5.4r34' 5 + PUBLISH_VERSION = '4.5.5.4r35'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 7 }
8 8
9 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" 9 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"
10 10
11 android { 11 android {
12 - namespace 'ly.warp.sdk'
13 compileSdkVersion 34 12 compileSdkVersion 34
14 buildToolsVersion "34.0.0" 13 buildToolsVersion "34.0.0"
15 14
......
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 - xmlns:tools="http://schemas.android.com/tools"> 2 + xmlns:tools="http://schemas.android.com/tools"
3 + package="ly.warp.sdk">
3 4
4 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 5 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
5 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 6 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
5 <attr name="dashLength" format="dimension" /> 5 <attr name="dashLength" format="dimension" />
6 <attr name="dashGap" format="dimension" /> 6 <attr name="dashGap" format="dimension" />
7 <attr name="dashThickness" format="dimension" /> 7 <attr name="dashThickness" format="dimension" />
8 - <attr name="colorPrimary" format="color" />
9 <attr name="orientation" format="enum"> 8 <attr name="orientation" format="enum">
10 <enum name="horizontal" value="0" /> 9 <enum name="horizontal" value="0" />
11 <enum name="vertical" value="1" /> 10 <enum name="vertical" value="1" />
......