Compile with sdk 27
authorDa Risk <da_risk@beem-project.com>
Thu, 21 Dec 2017 15:56:42 -0800
changeset 1073 274f38e8c8a9
parent 1072 137d0bf0e959
child 1074 5612909addf8
Compile with sdk 27
app/build.gradle
app/src/main/AndroidManifest.xml
build.gradle
gradle/wrapper/gradle-wrapper.properties
third_parties/memorizingtrustmanager/build.gradle
third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MemorizingTrustManager.java
third_parties/mmssmiley/build.gradle
third_parties/stroke/build.gradle
--- a/app/build.gradle	Fri Jan 08 11:31:18 2016 +0100
+++ b/app/build.gradle	Thu Dec 21 15:56:42 2017 -0800
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "22.0.0"
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "com.beem.project.beem"
-        minSdkVersion 6
+        minSdkVersion 14
         targetSdkVersion 22
         versionCode 15
         versionName "0.1.8"
@@ -29,12 +28,12 @@
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(":third_parties:memorizingtrustmanager")
-    compile project(":third_parties:stroke")
-    compile project(":third_parties:mmssmiley")
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'org.jitsi:org.otr4j:0.22'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(":third_parties:memorizingtrustmanager")
+    implementation project(":third_parties:stroke")
+    implementation project(":third_parties:mmssmiley")
+    implementation 'com.android.support:support-v4:27.0.2'
+    implementation 'org.jitsi:org.otr4j:0.22'
 }
 
 apply from: "$project.rootDir/tools/android-checkstyle.gradle"
--- a/app/src/main/AndroidManifest.xml	Fri Jan 08 11:31:18 2016 +0100
+++ b/app/src/main/AndroidManifest.xml	Thu Dec 21 15:56:42 2017 -0800
@@ -11,12 +11,15 @@
 	<permission android:permissionGroup="android.permission-group.NETWORK"
 		android:label="BeemService" android:description="@string/BeemServiceDescription"
 		android:name="com.beem.project.beem.BEEM_SERVICE"/>
+
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.VIBRATE"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
 	<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:maxSdkVersion="22" />
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"/>
 	
 	<supports-screens android:largeScreens="true"
--- a/build.gradle	Fri Jan 08 11:31:18 2016 +0100
+++ b/build.gradle	Thu Dec 21 15:56:42 2017 -0800
@@ -2,14 +2,16 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
--- a/gradle/wrapper/gradle-wrapper.properties	Fri Jan 08 11:31:18 2016 +0100
+++ b/gradle/wrapper/gradle-wrapper.properties	Thu Dec 21 15:56:42 2017 -0800
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
--- a/third_parties/memorizingtrustmanager/build.gradle	Fri Jan 08 11:31:18 2016 +0100
+++ b/third_parties/memorizingtrustmanager/build.gradle	Thu Dec 21 15:56:42 2017 -0800
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 6
@@ -19,5 +18,5 @@
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MemorizingTrustManager.java	Fri Jan 08 11:31:18 2016 +0100
+++ b/third_parties/memorizingtrustmanager/src/main/java/de/duenndns/ssl/MemorizingTrustManager.java	Thu Dec 21 15:56:42 2017 -0800
@@ -371,9 +371,8 @@
 		Notification n = new Notification(android.R.drawable.ic_lock_lock,
 				master.getString(R.string.mtm_notification),
 				System.currentTimeMillis());
-		n.setLatestEventInfo(master.getApplicationContext(),
-				master.getString(R.string.mtm_notification),
-				certName, intent);
+		n.contentIntent = intent;
+		n.tickerText = master.getString(R.string.mtm_notification);
 		n.flags |= Notification.FLAG_AUTO_CANCEL;
 
 		notificationManager.notify(NOTIFICATION_ID, n);
--- a/third_parties/mmssmiley/build.gradle	Fri Jan 08 11:31:18 2016 +0100
+++ b/third_parties/mmssmiley/build.gradle	Thu Dec 21 15:56:42 2017 -0800
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 6
@@ -19,5 +18,5 @@
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/third_parties/stroke/build.gradle	Fri Jan 08 11:31:18 2016 +0100
+++ b/third_parties/stroke/build.gradle	Thu Dec 21 15:56:42 2017 -0800
@@ -1,5 +1,5 @@
 apply plugin: 'java'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }