Panagiotis Triantafyllou

new gradle fixes

1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="CompilerConfiguration"> 3 <component name="CompilerConfiguration">
4 - <bytecodeTargetLevel target="17" /> 4 + <bytecodeTargetLevel target="21" />
5 </component> 5 </component>
6 </project> 6 </project>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="UTF-8"?>
1 <project version="4"> 2 <project version="4">
2 <component name="DesignSurface"> 3 <component name="DesignSurface">
3 <option name="filePathToZoomLevelMap"> 4 <option name="filePathToZoomLevelMap">
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
183 </map> 184 </map>
184 </option> 185 </option>
185 </component> 186 </component>
186 - <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> 187 + <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
187 <output url="file://$PROJECT_DIR$/build/classes" /> 188 <output url="file://$PROJECT_DIR$/build/classes" />
188 </component> 189 </component>
189 <component name="ProjectType"> 190 <component name="ProjectType">
......
...@@ -47,6 +47,14 @@ android { ...@@ -47,6 +47,14 @@ android {
47 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 47 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
48 } 48 }
49 } 49 }
50 +
51 + namespace "warp.ly.android_sdk"
52 +
53 + packaging {
54 + jniLibs {
55 + useLegacyPackaging true
56 + }
57 + }
50 } 58 }
51 59
52 dependencies { 60 dependencies {
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
16 android:name="warp.ly.android_sdk.WarplyAndroidSDKApplication" 16 android:name="warp.ly.android_sdk.WarplyAndroidSDKApplication"
17 android:allowBackup="false" 17 android:allowBackup="false"
18 android:exported="true" 18 android:exported="true"
19 - android:extractNativeLibs="true"
20 android:fullBackupContent="false" 19 android:fullBackupContent="false"
21 android:hardwareAccelerated="true" 20 android:hardwareAccelerated="true"
22 android:icon="@mipmap/ic_launcher" 21 android:icon="@mipmap/ic_launcher"
......
...@@ -8,9 +8,9 @@ buildscript { ...@@ -8,9 +8,9 @@ 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:7.1.3' 11 + classpath 'com.android.tools.build:gradle:8.8.0'
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.9.1.300'
14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' 14 classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
15 15
16 // NOTE: Do not place your application dependencies here; they belong 16 // NOTE: Do not place your application dependencies here; they belong
......
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-7.2-bin.zip 4 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
5 zipStoreBase=GRADLE_USER_HOME 5 zipStoreBase=GRADLE_USER_HOME
6 zipStorePath=wrapper/dists 6 zipStorePath=wrapper/dists
......
...@@ -32,12 +32,12 @@ afterEvaluate { ...@@ -32,12 +32,12 @@ 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.release 35 + from(project.components.findByName("release"))
36 } else { 36 } else {
37 from components.java 37 from components.java
38 } 38 }
39 39
40 - artifact androidSourcesJar 40 + // Sources are now handled by the android block's singleVariant
41 // artifact javadocJar 41 // artifact javadocJar
42 42
43 // Mostly self-explanatory metadata 43 // Mostly self-explanatory metadata
......
1 apply plugin: 'com.android.library' 1 apply plugin: 'com.android.library'
2 +apply plugin: 'maven-publish'
3 +
4 +android.buildFeatures.buildConfig = true
2 5
3 ext { 6 ext {
4 PUBLISH_GROUP_ID = 'ly.warp' 7 PUBLISH_GROUP_ID = 'ly.warp'
5 - PUBLISH_VERSION = '4.5.5.4r43' 8 + PUBLISH_VERSION = '4.5.5.4r46'
6 PUBLISH_ARTIFACT_ID = 'warply-android-sdk' 9 PUBLISH_ARTIFACT_ID = 'warply-android-sdk'
7 } 10 }
8 11
...@@ -14,6 +17,14 @@ android { ...@@ -14,6 +17,14 @@ android {
14 17
15 useLibrary 'org.apache.http.legacy' 18 useLibrary 'org.apache.http.legacy'
16 19
20 + publishing {
21 + // Configure all components to be published
22 + singleVariant('release') {
23 + // Publish the release variant with sources
24 + withSourcesJar()
25 + }
26 + }
27 +
17 defaultConfig { 28 defaultConfig {
18 minSdkVersion 23 29 minSdkVersion 23
19 targetSdkVersion 34 30 targetSdkVersion 34
...@@ -44,6 +55,8 @@ android { ...@@ -44,6 +55,8 @@ android {
44 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 55 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
45 } 56 }
46 } 57 }
58 +
59 + namespace "ly.warp.sdk"
47 } 60 }
48 61
49 dependencies { 62 dependencies {
...@@ -114,33 +127,17 @@ dependencies { ...@@ -114,33 +127,17 @@ dependencies {
114 } 127 }
115 128
116 // In every export please update the version number 129 // In every export please update the version number
117 -task deleteJarLibrary(type: Delete) { 130 +tasks.register('deleteJarLibrary', Delete) {
118 delete 'jar/warply_android_sdk_v4.5.0.jar' 131 delete 'jar/warply_android_sdk_v4.5.0.jar'
119 } 132 }
120 133
121 -//from('build/intermediates/compile_library_classes/release/') 134 +tasks.register('createJarLibrary', Jar) {
122 - 135 + dependsOn('assembleRelease')
123 -//Old version 136 + from(fileTree('build/intermediates/aar/release/'))
124 -// Gradle Tasks -> warply_android_sdk -> Tasks -> other -> createJarLibrary 137 + destinationDirectory = file('jar')
125 -//task createJarLibrary(type: Copy) { 138 + archiveFileName = "warply_android_sdk_v${PUBLISH_VERSION}.jar"
126 -// from fileTree('build/intermediates/bundles/release/')
127 -// into('jar/')
128 -// include('classes.jar')
129 -// rename('classes.jar', 'warply_android_sdk_v4.4.2.jar')
130 -//}
131 -
132 -// New version
133 -// Gradle -> warplyDemo -> libraries -> warply_android_sdk -> Run Configurations -> assembleRelease
134 -// When finished it copies the .jar into
135 -// warply_android_sdk -> build -> intermediates -> full_jar -> release/debug -> full.jar
136 -
137 -// 24 - Jan - 2022
138 -// Gradle -> warplyDemo -> libraries -> warply_android_sdk -> Tasks -> build -> build
139 -// When finished it copies the .aar into
140 -// warply_android_sdk -> build -> outputs -> aar -> warply_android_sdk-release.aar
141 -
142 -task createJarLibrary(type: Jar, dependsOn: 'assembleRelease') {
143 - from fileTree('build/intermediates/bundles/release/')
144 } 139 }
145 140
146 -createJarLibrary.dependsOn(deleteJarLibrary, build) 141 +tasks.named('createJarLibrary') {
142 + dependsOn('deleteJarLibrary', 'build')
143 +}
......