Merge pull request #30 from OCSInventory-NG/update-to-27

Update to 27
OCSInventory-NG · May 20, 2020 · 37d8b79 · 37d8b79
2 parents 6f09a30 + 3f7c039
commit 37d8b79
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,10 @@
 Revision history for Ocsinventory NG Android Agent
 
+2.7
+    * Update gradle
+    * Improve stability
+    * Add phone number inventory (main sim only)
+
 2.3.1
     * Fix permissions on android 6 and more
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.3'
 
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "org.ocs.android.agent"
-        minSdkVersion 9
-        targetSdkVersion 23
+        minSdkVersion 26
+        targetSdkVersion 26
     }
 
     buildTypes {
@@ -23,6 +23,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.2.1'
-    compile 'com.android.support:appcompat-v7:23.2.1'
+    implementation 'com.android.support:support-v4:26.1.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,8 @@
 <manifest package="org.ocs.android.agent"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="250"
-          android:versionName="2.3.1">
+          android:versionCode="270"
+          android:versionName="2.7">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

diff --git a/app/src/main/res/values/strings_nt.xml b/app/src/main/res/values/strings_nt.xml
@@ -28,7 +28,7 @@
     <string name="pref_default_freqwake" translatable="false">10</string>
     <string name="pref_default_cachelen" translatable="false">900000</string>
 
-    <string name="comp_useragent" translatable="false">OCS-NG_Android_agent_v2.0</string>
-    <string name="useragent" translatable="false">OCS-NG_Android_agent_v2.3.1</string>
+    <string name="comp_useragent" translatable="false">OCS-NG_Android_agent_v2.2</string>
+    <string name="useragent" translatable="false">OCS-NG_Android_agent_v2.7</string>
     <string name="point" translatable="false">.</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
+
     }
 }
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 10 09:28:49 CEST 2017
+#Wed Apr 01 09:40:31 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip