Skip to content

Commit

Permalink
Refactor of packages from de.tudarmstadt.informatik.hostage to dk.aau…
Browse files Browse the repository at this point in the history
….netsec.hostage. + Upgrade to target sdk 29.
  • Loading branch information
irinil committed Aug 26, 2020
1 parent e47578e commit 27864f7
Show file tree
Hide file tree
Showing 257 changed files with 1,129 additions and 1,132 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -119,7 +119,7 @@ dependencies {

// Required -- JUnit 4 framework
testImplementation 'junit:junit:4.12'
//testImplementation 'androidx.de.tudarmstadt.informatik.hostage.test:core:1.2.0'
//testImplementation 'androidx.test:core:1.2.0'

// Optional -- Mockito framework
testImplementation "org.mockito:mockito-core:3.4.4"
Expand Down Expand Up @@ -151,13 +151,13 @@ configurations {
}

android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion '29.0.3'
defaultConfig {
versionCode 7
versionName "2.0.0"
minSdkVersion 24
targetSdkVersion 28
targetSdkVersion 29
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
javaCompileOptions {
Expand Down
4 changes: 2 additions & 2 deletions google-services.json
Expand Up @@ -10,15 +10,15 @@
"client_info": {
"mobilesdk_app_id": "1:283609891050:android:c9df120509b30ca36e9793",
"android_client_info": {
"package_name": "de.tudarmstadt.informatik.hostage"
"package_name": "dk.aau.netsec.hostage"
}
},
"oauth_client": [
{
"client_id": "283609891050-jdphgin4k1cl79jdc1fjs9qkak9bmquj.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "de.tudarmstadt.informatik.hostage",
"package_name": "dk.aau.netsec.hostage",
"certificate_hash": "3611fd3f232bc7a9f8afbd41824c9d1ae2efc9f8"
}
},
Expand Down
16 changes: 8 additions & 8 deletions robo_test_pr-35_30062020.json
Expand Up @@ -49,7 +49,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/home_switch_connection",
"resourceId": "dk.aau.netsec.hostage:id/home_switch_connection",
"contentDescription": "",
"text": ""
},
Expand Down Expand Up @@ -95,7 +95,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 0,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar",
"resourceId": "dk.aau.netsec.hostage:id/action_bar",
"contentDescription": "",
"text": ""
},
Expand All @@ -104,7 +104,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar_container",
"resourceId": "dk.aau.netsec.hostage:id/action_bar_container",
"contentDescription": "",
"text": ""
}
Expand All @@ -123,7 +123,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/home_button_connection_info",
"resourceId": "dk.aau.netsec.hostage:id/home_button_connection_info",
"contentDescription": "",
"text": ""
},
Expand Down Expand Up @@ -206,7 +206,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 0,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar",
"resourceId": "dk.aau.netsec.hostage:id/action_bar",
"contentDescription": "",
"text": ""
},
Expand All @@ -215,7 +215,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar_container",
"resourceId": "dk.aau.netsec.hostage:id/action_bar_container",
"contentDescription": "",
"text": ""
}
Expand Down Expand Up @@ -243,7 +243,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/left_drawer",
"resourceId": "dk.aau.netsec.hostage:id/left_drawer",
"contentDescription": "",
"text": ""
},
Expand All @@ -252,7 +252,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 0,
"resourceId": "de.tudarmstadt.informatik.hostage:id/drawer_layout",
"resourceId": "dk.aau.netsec.hostage:id/drawer_layout",
"contentDescription": "",
"text": ""
}
Expand Down
12 changes: 6 additions & 6 deletions robo_test_pr-37-30062020.json
Expand Up @@ -49,7 +49,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/home_switch_connection",
"resourceId": "dk.aau.netsec.hostage:id/home_switch_connection",
"contentDescription": "",
"text": ""
},
Expand Down Expand Up @@ -86,7 +86,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/home_button_connection_info",
"resourceId": "dk.aau.netsec.hostage:id/home_button_connection_info",
"contentDescription": "",
"text": ""
},
Expand Down Expand Up @@ -169,7 +169,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 0,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar",
"resourceId": "dk.aau.netsec.hostage:id/action_bar",
"contentDescription": "",
"text": ""
},
Expand All @@ -178,7 +178,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/action_bar_container",
"resourceId": "dk.aau.netsec.hostage:id/action_bar_container",
"contentDescription": "",
"text": ""
}
Expand Down Expand Up @@ -206,7 +206,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 1,
"resourceId": "de.tudarmstadt.informatik.hostage:id/left_drawer",
"resourceId": "dk.aau.netsec.hostage:id/left_drawer",
"contentDescription": "",
"text": ""
},
Expand All @@ -215,7 +215,7 @@
"recyclerViewChildPosition": -1,
"adapterViewChildPosition": -1,
"groupViewChildPosition": 0,
"resourceId": "de.tudarmstadt.informatik.hostage:id/drawer_layout",
"resourceId": "dk.aau.netsec.hostage:id/drawer_layout",
"contentDescription": "",
"text": ""
}
Expand Down
@@ -1,5 +1,5 @@

package de.tudarmstadt.informatik.hostage.profile;
package dk.aau.netsec.hostage;
import android.graphics.Bitmap;
import android.os.Parcel;

Expand All @@ -13,7 +13,7 @@
import java.util.HashMap;


import de.tudarmstadt.informatik.hostage.model.Profile;
import dk.aau.netsec.hostage.model.Profile;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.logging;
package dk.aau.netsec.hostage.logging;

import android.os.Parcel;

Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -19,7 +19,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -18,7 +18,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -19,7 +19,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -19,7 +19,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;

import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -18,7 +18,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -19,7 +19,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down
@@ -1,4 +1,4 @@
package de.tudarmstadt.informatik.hostage.ui.activity;
package dk.aau.netsec.hostage.ui.activity;


import android.view.View;
Expand All @@ -19,7 +19,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import de.tudarmstadt.informatik.hostage.R;
import dk.aau.netsec.hostage.R;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
Expand Down

0 comments on commit 27864f7

Please sign in to comment.