Showing
9 changed files
with
20 additions
and
8 deletions
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 | ... | ... |
... | @@ -4,6 +4,7 @@ | ... | @@ -4,6 +4,7 @@ |
4 | <component name="GradleSettings"> | 4 | <component name="GradleSettings"> |
5 | <option name="linkedExternalProjectsSettings"> | 5 | <option name="linkedExternalProjectsSettings"> |
6 | <GradleProjectSettings> | 6 | <GradleProjectSettings> |
7 | + <option name="testRunner" value="CHOOSE_PER_TEST" /> | ||
7 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> | 8 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
8 | <option name="gradleHome" value="$PROJECT_DIR$/../../../../../../gradle-6.6.1" /> | 9 | <option name="gradleHome" value="$PROJECT_DIR$/../../../../../../gradle-6.6.1" /> |
9 | <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> | 10 | <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> | ... | ... |
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,7 +32,8 @@ afterEvaluate { | ... | @@ -32,7 +32,8 @@ 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 components.release |
36 | + from components.findByName('release') | ||
36 | } else { | 37 | } else { |
37 | from components.java | 38 | from components.java |
38 | } | 39 | } | ... | ... |
... | @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' | ... | @@ -2,7 +2,7 @@ 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.4r40' | 5 | + PUBLISH_VERSION = '4.5.5.4r45' |
6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' | 6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' |
7 | } | 7 | } |
8 | 8 | ||
... | @@ -44,6 +44,8 @@ android { | ... | @@ -44,6 +44,8 @@ android { |
44 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | 44 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' |
45 | } | 45 | } |
46 | } | 46 | } |
47 | + | ||
48 | + namespace "ly.warp.sdk" | ||
47 | } | 49 | } |
48 | 50 | ||
49 | dependencies { | 51 | dependencies { | ... | ... |
-
Please register or login to post a comment